自宅サーバの変更
Merge branch 'master' of github.com:akinama/dotfiles

Conflicts:
	.vimrc