Merge branch 'gh-pages'
...
What is up with this url?
Maybe?
Merge branch 'master' into gh-pages

Conflicts:
	_includes/post.html