Merge branch 'index.html'

Conflicts:
	web.js