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

Conflicts:
	.vimrc
.zshrcの変更
Merge branch 'master' of github.com:TKNGUE/dotfiles
modified
Merge branch 'master' of github.com:TKNGUE/dotfiles into note_pc

Conflicts:
	.vimrc
とりあえずコミット