something old
Merge branch 'master' of https://github.com/onakaponpon/myAppsGit

Conflicts:

mySketch1208/mySketch1208.xcodeproj/project.xcworkspace/xcuserdata/akira
.xcuserdatad/UserInterfaceState.xcuserstate