bonus exercises
Merge branch 'master' of https://github.com/morcik/sample_app2