Forgot what I did

huh
Merge branch 'master' of https://github.com/DontSuCharlie/LegacyDungeon

Conflicts:
	LegacyDungeon.java
	testing.class
Merge branch 'master' of https://github.com/DontSuCharlie/LegacyDungeon

Conflicts:
	LegacyDungeon.java
	testing.class