Merge branch 'master' of https://github.com/faern/book-a-hobbit

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/InventoryManagerImpl.java
Merge branch 'master' of https://github.com/faern/book-a-hobbit