Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 2022894216594d3306919941a63275ab6c9dedeb.