new post
Merge branch 'master' of https://github.com/maistho/maistho.github.io

Conflicts:
	_posts/2014-11-24-moving-a-folder-to-its-own-git-repo.md