finalized merger with james' code. The only bugs are now in FourRooms.java