I cheated
Merge branch 'cheating'

Conflicts:
	index.html
idea