Battle Sprites
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/battle/Battle.class
	bin/com/pewpy/pewp/Game.class
	bin/com/pewpy/pewp/entity/mob/Mob.class
	bin/com/pewpy/pewp/entity/mob/Player.class
	bin/com/pewpy/pewp/graphics/Screen.class
	src/battle/Battle.java
	src/com/pewpy/pewp/entity/mob/Mob.java
Merge branch 'master' of https://github.com/jordandeang/CompSciFinal

Conflicts:
	bin/battle/Battle.class
	bin/com/pewpy/pewp/entity/mob/Player.class
	src/battle/Battle.java