Merge pull request #2 from fhirt/fhirt_development

Fhirt development
Merge branch 'fhirt_development' of https://github.com/fhirt/dungeon_escape

Update minor changes to master
Merge branch 'fhirt_development' of https://github.com/fhirt/dungeon_escape
added testroom class to test basic maps with
Merge pull request #3 from fhirt/flo_development

added testroom class to test basic maps with