Merge
Merge branch 'master' of https://github.com/ukitaka/dotfiles

Conflicts:
	.vimrc
itermの色設定を追加