Merge branch 'gh-pages'

Conflicts:
	css/main.css