Fixed no-melee problem
Merge branch 'master' of https://github.com/wpapsco/Generic-Zelda-Clone

Conflicts:
	bin/com/me/mygdxgame/GameScreen.class
	bin/com/me/mygdxgame/Player.class
	src/com/me/mygdxgame/Player.java