wrote fight method, made it target, back to fight
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Player.java