中文乱码解决
Merge branch 'master' of github.com:rickdgit/Blog

Conflicts:
	vim环境配置手记.md