Merge branch 'master' of https://github.com/munificent/game-programming-patterns

Conflicts:
	book/type-object.markdown

For some reason, the Type Object chapter had a conflict. I checked your repository and changed the file to match what you committed, so hopefully this works!

Author: LaurenBee

book/subclass-sandbox.markdown

@@ -255,7 +255,7 @@ whatsoever.
 <aside name="include">
 
 Concretely, this means each source file for a subclass would only need a single
-`#include`: the one for its base class.
+`#include` -- the one for its base class.
 
 </aside>
 

book/type-object.markdown

@@ -29,7 +29,7 @@ all monsters of the same breed attack the same way.
 
 ### The typical OOP answer
 
-Given the above game design, we fire up our text editor and start coding. According
+With that game design in mind, we fire up our text editor and start coding. According
 to the design, a dragon <span name="isa">is a</span> kind of monster, a troll is
 another kind, and so on with the other breeds. Thinking object-oriented, that
 leads us to a `Monster` base class:
@@ -633,7 +633,7 @@ zombie one.
 
      *  *Looking up attributes is slower.* To get a given piece of data from a
         type object, we may now need to walk up the inheritance chain to find
-        the type that ultimately decides the value. If we're in 
+        the type that ultimately decides the value. If we're in
         performance-critical code, we may not want to spend time on this.
 
  *  **Multiple inheritance:**

note/log.txt

@@ -1,3 +1,9 @@
+2014-07-26 - merge type object changes
+2014-07-25 - print table of contents
+2014-07-24 - email
+2014-07-23 - ebook table of contents
+2014-07-22 - layout subclass sandbox
+2014-07-21 - fix #234 and merge subclass sandbox changes
 2014-07-20 - email
 2014-07-19 - start sketching cover illustration
 2014-07-18 - more cover comps