李娜退役
Merge branch 'master' of https://github.com/LiuJi-Jim/life-blog

Conflicts:
	public/2012/03/05/hello-world/index.html
	public/2012/06/02/我眼中那些（因为滥用）而被毁掉的警句/index.html
	public/2012/08/24/话痨的生日/index.html
	public/2012/09/07/jim-plays/index.html
	public/2012/09/25/《黑客与画家》-文摘/index.html
	public/2012/09/26/我这6年来的成长与倒退，暨《黑客与画家》读后感/index.html
	public/2013/03/02/sony-nex-6入手初评/index.html
	public/2013/08/31/htc-one-半月谈/index.html
	public/about/index.html
	public/archives/2012/03/index.html
	public/archives/2012/06/index.html
	public/archives/2012/08/index.html
	public/archives/2012/09/index.html
	public/archives/2012/10/index.html
	public/archives/2012/index.html
	public/archives/2013/03/index.html
	public/archives/2013/08/index.html
	public/archives/2013/index.html
	public/archives/index.html
	public/feedback/index.html
	public/index.html
	public/tags/影像/index.html
	public/tags/未分类/index.html
	public/tags/生活/index.html
	public/tags/站着说话不腰疼/index.html
	public/tags/编程/index.html
	public/tags/音乐/index.html