Hey Team Diversity
Merge branch 'ollie'

Conflicts:
	app/index.html
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/index.html