- fucking merge ahead
Merge branch 'master' of https://github.com/DavidPfander/dungeon

Conflicts:
	Dungeon/src/config.lua
	Dungeon/src/main.lua