Changes up throught Ch. 11
Merge pull request #28 from nobozo/master

Changes through Ch. 11