コテタカからマスター
Merge branch 'master' of https://github.com/yam-yanu/BTO

Conflicts:

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