week 4 work
oops
oops
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01

Conflicts:
	week-03/.DS_Store
Work from week 4
Merge branch 'master' of https://github.com/gsus3jo/gbc_comp-9635_01

Conflicts:
	.DS_Store
	week-04/trejo-jesus/index.html
Some updates
updates
Merge remote-tracking branch 'gsus3jo/master'

Conflicts:
	week-05/tennant-calvin/index.html
ds store
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01