一時保存
Merge branch 'master' of github.com:koseki0000/vimconfig

Conflicts:
	vimrc
Merge branch 'master' of github.com:koseki0000/vimconfig
macbookから