Merge branch 'gh-pages'

Conflicts:
	assets/empty.html
	assets/no-empty.html