repair
repair
不要ファイル削除
Merge branch 'master' of github.com:sakurazuka/vimrc

Conflicts:
	.DS_Store
	.gitignore
	_vim/.DS_Store
	_vim/.netrwhist
	_vim/colors/.DS_Store