hist
Merge branch 'master' of https://github.com/ddsbook/blog

Conflicts:
	2014/drafts/do-you-want-to-steal-a-snowman.md