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

Conflicts:
	trunk/Whack-A-Foe/src/com/bulalo/MenuWorld/MenuWorld.java
MERGE