《XShell 链接 Linux 中文乱码》
Merge branch 'gh-pages' of https://github.com/yokoboy/blog into gh-pages

Conflicts:
	_posts/2014-12-02-xshell link-linux-chinese-garbled.html