Sync
Sync
Merge branch 'master' of https://github.com/eclipsezym/Lua_studying

Conflicts:
	cocos2d-x-3.1.1/project/Lua_studying/src/main.lua