starting delores
finished delores
Merge branch 'delores'

Conflicts:
	index.html