Doing part of the ace feature
Merge remote-tracking branch 'origin/master'
GG i cant even messafe gcomtian
gi
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dung/src/dungMain/DungeonGame.java