added enumerations and additions to design
Merge branch 'master' of https://github.com/jrdoughty/DungeonMaker