cleanup
Merge branch 'master' of github.com:lili2311/blog

Conflicts:
	_posts/2013-01-16-Hello-World.md