Changed name in Guest: setRoom to setRoomNr (we need to come up with better names!!!)
Merge branch 'classdiag' of https://github.com/dannylam/ogretel into classdiag