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