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

Conflicts:
	CollisionTypes.vcxproj.filters