parts 1-2 complete
Merge branch 'master' of https://github.com/joshuaadampoirier/getdata-007_courseproject