map folder
Merge branch 'master' of github.com:max-weller/labyrinth

Conflicts:
	mainmenu.lua