a
Merge branch 'master' of https://github.com/foursides/foursides.github.io

Conflicts:
	_posts/2014-08-03-Encounters-with-Iceland-at-Mission-Hill-Winery.md