day 5
Merge branch 'master' of https://github.com/coleww/appacademy-exercises