Merge branch 'master' into create-vimrc-1
modify .vimrc
Merge branch 'create-vimrc-1'
Merge branch 'master' into update-gitconfig-5
modify gitconfig
Merge branch 'update-gitconfig-5'