I added comments for things i want
Merge branch 'master' of https://github.com/atinydirtypony/Dungeon

Conflicts:
	Dungeon/dungeon.js