Server index.html on page load
Expanded index.html
Merge branch 'index.html'

Conflicts:
	web.js