プロジェクトファイル更新
Merge branch 'master' of github.com:iichin0708/ScrollAndPickUp

Conflicts:
	proj.ios/ScrollAndPickUp.xcodeproj/project.pbxproj
Merge branch 'master' of github.com:iichin0708/ScrollAndPickUp