Changes to teaser website text
Merge remote-tracking branch 'heroku/master'

Conflicts:
	index.html