Another Room class push

Signed-off-by: mourthag <julispittel@gmail.com>
Merge branch 'master' into current

Conflicts:
	Room.class
	Room.ctxt
	Room.java
	bossRoom.class
	project.greenfoot
	standardRoom.class
	standardRoom.ctxt
	starterRoom.class