Halfway to something useful
This line should be comments
Merge branch 'master' of https://github.com/Wiadi/DungeoneGit.git

Conflicts:
	src/GameMap.java