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

Conflicts:
	editor-dungeon-crawl/editor-dungeon-crawl/mycanvas.h