パラメータ調整終了
Merge branch 'master' of https://github.com/iichin0708/ScrollAndPickUp

Conflicts:

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