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