test

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

Conflicts:

usingCamera/usingCamera.xcodeproj/project.xcworkspace/xcuserdata/akira.x
cuserdatad/UserInterfaceState.xcuserstate