nyc
Merge branch 'master' of https://github.com/woshinyc/NycGame

Conflicts:
	NycGame/Classes/AppDelegate.cpp
	NycGame/Classes/HelloWorldScene.cpp
	NycGame/Classes/HelloWorldScene.h
	NycGame/game1.tmx