Define what for each room, so we don't have to check (room.what == undefined) later
Merge branch 'master' of https://github.com/2501/lab2