2nd
Merge branch 'gh-pages'

Conflicts:
	css/index.css
	index.html
	muse_manifest.xml
	sitemap.xml