Added HP to swordsman
Merge branch 'master' of https://github.com/abranch6/AI-battle

Conflicts:
	AI-battle-project/src/Swordsman.java
changes!
Merge remote-tracking branch 'origin/master'

Conflicts:
	AI-battle-project/src/AIBattle.java
	AI-battle-project/src/Character.java
	AI-battle-project/src/Swordsman.java
Merge branch 'master' of https://github.com/abranch6/AI-battle
semicolons