merging
Merge branch 'master' of github.com:markusberget/tda593-hotel
Added .toString() on RoomTypeName in testSearchRoom() to retrieve the String argument necessary for searchRoom