added resource dungeon
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hillgiantkiller/Hill_Giant_Killer.java
	src/hillgiantkiller/other/GUI.java