update
Merge branch 'master' of https://github.com/2youyouo2/light_in_the_dark

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