Merge branch 'master' of https://github.com/brann/sample_app