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

# By Noel Lava
# Via Noel Lava
* 'master' of https://github.com/NoelLava/whack-a-foe:
  test pull allen

Conflicts:
	trunk/Whack-A-Foe/bin/com/bulalo/GameObjects/Dummy.class
AssetsLoader? pota