finished chapter 4 and 5, started on 6
Merge pull request #2 from crenwick/dev

finished chapter 4 and 5, started on 6