share img
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/2013/2013-07-16-geojson-jackson.md