vimrc修正
Merge branch 'master' of https://github.com/takumi0125/dotfiles

Conflicts:
	common/.vimrc