Up through and including Ch. 06
Merge pull request #24 from nobozo/master

Changes Up To And Including Chap. 6