Merge branch 'master' into gh-pages
Resolving conflicts hackily
Delete (almost) everything. Clean slate.
Merge branch 'gh-pages'

Conflicts:
	index.html