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

Conflicts:
	project-dungeon-crawl/src/main.cpp
;
editor
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl into jon
editor
Fre 14/6 Jon Qt
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl into jon

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

Conflicts:
	project-dungeon-crawl/src/main.cpp
SMLLoader utan regex klar
Canvas/Display
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl into arvid

Conflicts:
	project-dungeon-crawl/src/main.cpp
inget
Merge branch 'master' of https://github.com/PutBoy/project-dungeon-crawl

Conflicts:
	project-dungeon-crawl/src/main.cpp
Merge branch 'jon'

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

Conflicts:
	editor-dungeon-crawl/editor-dungeon-crawl/main.cpp
.gitignore