conflicts

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

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