modified .vimrc
Merge branch 'master' of github.com:kaneshu/dotfiles
modified .zshrc
resolve conflict in .zshrc
Merge branch 'master' of github.com:kaneshu/dotfiles