Fixed stuff on troll
Merge branch 'master' of github.com:faern/book-a-hobbit