Added workshop room
Merge branch 'master' of https://github.com/EvanOconnell/Zuul.git

This commit also fixes conflicts in Game.java.
Borught back Room.empty(), fixed NPE with constructor...

Overrode toString() for debugging. Also implemented up and down direction in Game class.
Added four more rooms

workshop, basement, hallway, vault