Conflict
Merge branch 'gizmo'

Conflicts:
	index.html