高さと幅を調整
Merge branch 'master' of github.com:Rintarou/dotfiles

Conflicts:
	.vimrc.settings