A
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/2014-10-21-marshill.markdown