Rewrote DungeonGenerator a bit, is a bit cleaner
Merge remote-tracking branch 'origin/master'