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

Conflicts:
Team Project Game/src/javaGame/Game.java
Team Project Game/src/javaGame/MapScreen.java
classPath
merge