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