Merge pull request #12 from roro330/master

Merged all map generation into Dungeon class