first commit before chap 3
Merge branch 'master' of github.com:jimfmunro/angello