要らない物を削除
Merge branch 'master' of https://github.com/masahide/dotfiles

Conflicts:
	.vimrc