;
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl into jon

Conflicts:
	project-dungeon-crawl/src/main.cpp
;
editor
editor
Merge branch 'jon' of https://github.com/PutBoy/project-dungeon-crawl

Conflicts:
	project-dungeon-crawl/src/main.cpp