My first try at html
Merge branch 'CasellasLab-pages'

Conflicts:
	index.html