post
Merge branch 'master' of github.com:freader/freader.github.io

Conflicts:
	_posts/2014-05-05-AboutMyLife.md
post