code change
Merge branch 'master' of https://github.com/zxzAndyMAC/NoiceBird

Conflicts:
	Classes/MainScene.cpp