gitv追加
conflict修正
hogehoge
merged
add vim-gitgutter
Merge branch 'master' of https://github.com/kse201/dotfiles into windows

Conflicts:
	.vimrc.plugin
merge
merged with windows