get attack
Merge remote-tracking branch 'origin/Mikes-Branch' into MattBranch

Conflicts:
	core/src/regularClases/Character.java
Merged Mikes into Matt