first init
ingore build obj
ingore build obj
Merge branch 'master' of github.com:trarck/CCTest

Conflicts:
	.gitignore
	Classes/HelloWorldScene.cpp
	proj.win32/resource.h