misc
Merge branch 'master' of github.com:jhm15217/sample_app