first commit for test app
Merge branch 'master' of https://github.com/mfjenn/my_app