Merge branch 'gh-pages' of https://github.com/mariopineda/drpineda.ca into gh-pages

Conflicts:
	resources/mathbio/lesson5.html
Fixed commit conflict