update gitconfig
update vim
Merge branch 'master' of github.com:Hettomei/my_computer_conf