vimrcを修正
Merge branch 'master' of github.com:sabonawa/vimrc

Conflicts:
	.vimrc
conflictを修正