tims new stuff
Merge branch 'master' into tim

Conflicts:
	index.html
fix index