working setup
Merge branch 'master' of github.com:stevehb/sample_app