much rage

going to move onto something else for now
Merge branch 'master' of https://github.com/DontSuCharlie/LegacyDungeon

Conflicts:
	LegacyDungeon.java