merge .gvimrc .
Merge remote-tracking branch 'origin/master'

merged .gvimrc .
Merge branch 'master' of https://github.com/aiya000/dotfiles

merging.