updating ch3 for pushing to Apress
resolve merge conflicts
more updates
Merge branch 'master' of github.com:ICantThinkOfAGoodUserName/JamieBook2