DS_Store
コミット
Merge branch 'master' into Kenji

Conflicts:
	Classes/HelloWorldScene.cpp
	proj.ios/.DS_Store
	proj.ios/ScrollAndPickUp.xcodeproj/project.pbxproj

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate
画面解像度固定
Merge branch 'Kenji'

Conflicts:
	proj.ios/.DS_Store

proj.ios/ScrollAndPickUp.xcodeproj/project.xcworkspace/xcuserdata/gpn.xc
userdatad/UserInterfaceState.xcuserstate