made joke less funny
feeling fine
Merge branch 'no-joke'

Conflicts:
	index.html