no message
Merge branch 'master' of https://github.com/NoelLava/whack-a-foe

Conflicts:
	trunk/Whack-A-Foe/bin/com/bulalo/GameWorld/GameWorld.class
	trunk/Whack-A-Foe/bin/com/bulalo/Helpers/AssetLoader.class
	trunk/Whack-A-Foe/bin/com/bulalo/Helpers/InputHandler.class
	trunk/Whack-A-Foe/bin/com/bulalo/MenuWorld/MenuInputHandler.class
	trunk/Whack-A-Foe/bin/com/bulalo/MenuWorld/MenuRenderer.class
	trunk/Whack-A-Foe/bin/com/bulalo/MenuWorld/MenuWorld.class
	trunk/Whack-A-Foe/bin/com/bulalo/Screens/MenuScreen.class
	trunk/Whack-A-Foe/bin/com/bulalo/Screens/SplashScreen.class