diego edit
master edit
Merge branch 'diego'

Conflicts:
	index.html
conflict