more stuff!
Merge branch 'master' of https://github.com/wpapsco/Generic-Zelda-Clone

Conflicts:
	assets/data/dungeonTest1.tmx
	bin/com/me/mygdxgame/Enemy.class
	bin/com/me/mygdxgame/GameScreen.class
	bin/com/me/mygdxgame/MapLight.class
	bin/com/me/mygdxgame/MapObjectFactory.class
	bin/com/me/mygdxgame/ObjectLoader.class
	bin/com/me/mygdxgame/Player.class
	bin/com/me/mygdxgame/UiTestScreen.class
	src/com/me/mygdxgame/UiTestScreen.java