hmm
Merge remote-tracking branch 'origin/master'

Conflicts:
	_posts/2014-08-06-blessed-are-the-gifmakers.md