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

Conflicts:
	trunk/Whack-A-Foe/bin/com/bulalo/ShopWorld/ShopRenderer.class
	trunk/Whack-A-Foe/src/com/bulalo/ShopWorld/ShopRenderer.java