b
Merge branch 'master' of 192.30.252.131:chenbingkun55/myconfigs

Conflicts:
	etc/myhome-conf/.vim/.vimrc.un~
	etc/myhome-conf/.vim/vimrc