so much text
Merge branch 'newstuff'

Conflicts:
	index.html