Got some stuff in
Merge branch 'master' of github.com:WalkingDisaster/Books