Merge branch 'master' of https://github.com/UWPCE-PythonCert/IntroPython2016a

Merging local repo with updated remote repo.

Author: sgrees

notebooks/ClassVsInstanceAttributes.ipynb

@@ -19,7 +19,7 @@ The first argument to the scoring function is itself a function that represents
 
 The second argument to the scoring function is one of three strings: small, medium or large.  
 
-The score for weapons across the various categories follow the fibonacci scale such that acceptance tests for the scoring function follow the following pattern.
+The score for weapons across the various categories follow the fibonacci scale such that acceptance tests for the scoring function follow the following pattern.  Keep in mind that you need not do any math to get the tests to pass.
 
 .. code-block:: python
 

notebooks/HTML_Rendering.ipynb

@@ -60,8 +60,8 @@
 .. |lightning-session07d| replace:: Yuanrui (Robert) Zhao
 .. |lightning-session07e| replace:: (anyone?)
 
-.. |lightning-session08a| replace:: Calvin Fannin
-.. |lightning-session08b| replace:: Michael Newton
+.. |lightning-session08a| replace:: Deana Holmer
+.. |lightning-session08b| replace:: Calvin Fannin
 .. |lightning-session08c| replace:: Abderrazak Derdouri
 .. |lightning-session08d| replace:: Brennen Bounds
 .. |lightning-session08e| replace:: Krishna Bindhu
@@ -76,4 +76,4 @@
 .. |lightning-session10b| replace:: Luis Ganzalez
 .. |lightning-session10c| replace:: Pradeep Kumar
 .. |lightning-session10d| replace:: Kyle Chinn
-.. |lightning-session10e| replace:: (anyone?)
+.. |lightning-session10e| replace:: Michael Newton