no change

no change
fight function

fight takes place
Merge remote-tracking branch 'origin/juammy-branch'

Conflicts:
	core/src/Screens/BattleScreen.java
	core/src/regularClases/Character.java