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

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

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

Conflicts:
	.vimrc