こまごまfrom Macbook
Merge branch 'master' of https://github.com/onakaponpon/Kaidaaaaan

Conflicts:

Kaidaaan/Kaidaaan.xcodeproj/project.xcworkspace/xcuserdata/akira.xcuserd
atad/UserInterfaceState.xcuserstate
こまごま