3 and4
Merge branch 'master' of https://github.com/marcusjbishop/gettingStarted