Canvas/Display
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl into arvid

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