week 3
Merge branch 'master' of https://github.com/ChantelleT/p0_unit1_submission
week 3- removed conflict files