battle screen

updated battle screen battles :)
battleconflict

conflict
Merge branch 'master' of https://github.com/dracul89/unhandledException

Conflicts:
	Team Project Game/src/javaGame/BattleScreen.java