もっかいもどした
Merge branch 'kotetaka' of github.com:yam-yanu/BTO into kotetaka

Conflicts:

BTO.xcodeproj/project.xcworkspace/xcuserdata/ami.xcuserdatad/UserInterfa
ceState.xcuserstate