last try
Merge branch 'master' of https://github.com/shengying/shengying.github.io

Conflicts:
	_posts/2014-04-08-hello-world.html