set nobackup
Merge branch 'master' of https://github.com/budougumi0617/dotfiles

Conflicts:
	home/.vimrc