整理
 Merge用コミット
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	.vimrc
Merge branch 'master' of github.com:TKNGUE/dotfiles

Conflicts:
	.vimrc