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