x
Merge branch 'master' of github.com:ManiacMike/2048-based-on-cocos2d-x