Revert "v"

This reverts commit 274ce89fbfd9a96463cd014110e876b0155b1363.
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html