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

Conflicts:
	trunk/Whack-A-Foe-desktop/bin/.gitignore
	trunk/Whack-A-Foe/src/com/bulalo/GameWorld/GameWorld.java
	trunk/Whack-A-Foe/src/com/bulalo/Helpers/AssetLoader.java