Finalized index page for second version

index finalized
Merge branch 'r2_index'

Conflicts:
	web/index.html
Merge remote-tracking branch 'origin/master' into r2_index

Conflicts:
	web/index.html
Merge branch 'r2_index'

Conflicts:
	web/index.html