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