book feature tests
Merge branch 'master' of https://github.com/Tyhjis/Will-Code-For-Booze into bookfeaturetest
Merge branch 'bookfeaturetest'