Merge branch 'master' of https://github.com/ga-students/WDI_SYD_7_Work into development
Merge branch 'development' of https://github.com/contact411/WDI_SYD_7_Work