merge
Merge branch 'master' of github.com:natsumisaito/dotfiles
Merge branch 'master' of github.com:natsumisaito/dotfiles

Conflicts:
	.vimrc