Merge branch 'gh-pages'
Revert dc46e09..20bbe84

This rolls back to commit dc46e094e465ba89832c7114a9defd4080351ce7.
Merge branch 'master' into gh-pages

Conflicts:
	.gitignore
	index.html
	smashit.scpt