Merge changes from Lauren.
Update log.
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!