idk what I did

Try and find out yourself. have fun
Merge branch 'master' of https://github.com/DontSuCharlie/LegacyDungeon

Conflicts:
	WorldMap.class