updated index
adding some master content
Merge branch 'master' into tim

Conflicts:
	index.html