Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	week-02/.DS_Store
week 4

week 4
week 4

week 4
week 4

week 4
week 4

week 4
week 4

week 4
week 4
week four google maps
still need revising
week 4
week 4 map
week 4
week 4 work
oops
oops
Merge branch 'master' of https://github.com/calvintennant/gbc_comp-9635_01

Conflicts:
	week-03/.DS_Store
week4 in class
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
Week 5