gemes
octopress
Merge branch 'gh-pages'

Conflicts:
	public/sitemap.xml