week 5
Merge branch 'master' of https://github.com/alisonsexton/gbc_comp-9635_01

Conflicts:
	week-04/sexton-alison/index.html
	week-04/sexton-alison/styles.css
Merge remote-tracking branch 'alisonsexton/master'
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01