index.html changes
Merge branch 'ma

Conflicts:
	index.html