week three changes
week three changes
week 3
Merge branch 'master' of github.com:alisonsexton/gbc_comp-9635_01 into alisonsexton-master

Conflicts:
	.DS_Store
	week-02/.DS_Store
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01