fixed a name bug
Merge branch 'JD'
Merge branch 'master' of https://github.com/dracul89/unhandledException

Conflicts:
	Team Project Game/src/javaGame/CharacterScreen.java
	Team Project Game/src/javaGame/MapScreen.java

updates several character screen and some mapscreen stuff
fixed merge issue

wow painful shell stuff
had a bug

fix it
Merge branch 'JD'
unused import

something like that
.DS_store
Map Update for Barbarians
battleScreen

updated battleScreen with:
- character image
- enemy image
- battle background
- modified battescreen with a keylistener to exit when escape is
pressed.
added HP and Magic to character stats
scaled the character image on the character Screen
Merge branch 'master' into JD