pewp
Merge branch 'master' of https://github.com/jordandeang/CompSciFinal

Conflicts:
	bin/battle/Battle.class
	bin/com/pewpy/pewp/Game.class
	bin/com/pewpy/pewp/entity/mob/Player.class
	bin/com/pewpy/pewp/graphics/Screen.class
	bin/com/pewpy/pewp/graphics/Sprite.class