Exercises 6.5
Merge branch 'master' of https://github.com/pvang10/sample_app