ch06, work in progress
Merge branch 'master' of github.com:ICantThinkOfAGoodUserName/JamieBook2