states and stuff
Merge branch 'master' of https://github.com/Danice123/DungeonCrawler

Conflicts:
	Dungeon.cpp
Merge branch 'master' of https://github.com/Danice123/DungeonCrawler