忘了更新啥
Merge branch 'master' of https://github.com/jiazhoulvke/myconf

Conflicts:
	bashrc