Attacks work
Merge remote-tracking branch 'origin/overworld' into overworld

Conflicts:
	src/chu/engine/Resources.java