getcategory copy
Merge branch 'master' of https://github.com/faern/book-a-hobbit
typecontroller impl
Merge branch 'master' of https://github.com/faern/book-a-hobbit
typeController create method
nothing
Merge branch 'master' of https://github.com/faern/book-a-hobbit

Conflicts:
	se.chalmers.TDA593.Book-a-Hobbit/src/hobbit/model/impl/TypeControllerImpl.java
regenerated code, booking now named bookingcomponent
new class idgenerator
Added add room to inventory manager
Merge branch 'master' of https://github.com/faern/book-a-hobbit
Made all controllers singleton. Return correct from factory
Merge branch 'master' of github.com:faern/book-a-hobbit
starting implementation of adding a type
Merge branch 'master' of https://github.com/faern/book-a-hobbit
add type
merge fix with master