well
Merge branch 'master' of https://github.com/TongZZZ/TongZZZ.github.io

Conflicts:
	_posts/2014-01-01-eleventh-post.md
test
Merge branch 'master' of https://github.com/TongZZZ/TongZZZ.github.io