yo dawg - models within models
Merge branch 'dev' of https://github.com/athurman/dungeon-crawl into dev