Initial commit
Merge branch 'master' of github.com:jumpinjan/sample_app