Changes up through Ch. 07
Merge pull request #25 from nobozo/master

Changes through Ch. 07