commit
Merge branch 'master' of https://github.com/LeBeam/CrazyWords

Conflicts:
	crazywords/Classes/AppDelegate.cpp
	crazywords/Classes/HelloWorldScene.cpp
	crazywords/Classes/HelloWorldScene.h