again added a bunch of stuff without keeping track of it
Merge branch 'master' of github.com:isimmons/larabook