Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work
Merge branch 'development' of https://github.com/pdhancock/WDI_SYD_7_Work
Merge branch 'development' of https://github.com/pdhancock/WDI_SYD_7_Work
hw completed