updated index file
Merge branch 'beta1' into gh-pages

Conflicts:
	index.html