Merge branch 'alt'

Conflicts:
	index.html
update