first commit
Merge branch 'master' of code.csdn.net:liaoyulei01/quick-cocos2d-x
Merge pull request #37 from dualface/master

Merge from dualface:master