updated main page
Merge branch 'master'

Conflicts:
	index.html