Card Study
Merge branch 'master' of https://github.com/coreMember/studyNewTechnique

Conflicts:
	pa/NewGame/Classes/HelloWorldScene.cpp