no message
Merge branch 'master' of https://github.com/zingzero/Demo1

Conflicts:
	Demo1/GameScene.m