post
Merge branch 'master' of https://github.com/zhangtao731/zhangtao731.github.com

Conflicts:
	_posts/2013-08-06-hello-world.md