local
Merge branch 'master' of https://github.com/Toboe/thule

Conflicts:
	_posts/citata/2013-07-19-Words.markdown