Merge branch 'master' of https://github.com/lyntco/wdi_melb_homework
Latest updates including warmups.
Merge branch 'master' of https://github.com/mike1372/wdi_melb_homework into mike1372-master
Merge branch 'mike1372-master'