Merge branch 'master' into kotetaka
うまくいった？
Revert 3078db2..b0ccca6

This rolls back to commit 3078db2f5c02f245ce9f192caa2b7dfbd8dbfb91.
俺のソース
うむ
Merge branch 'kotetaka'

Conflicts:

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