index fixes
Merge remote branch 'origin/master' into test5

Conflicts:
	index.html