Explanation of my changes
make something funny
Merge remote-tracking branch 'upstream/master'

Resolved Conflicts:
	index.html