comitt
commit!
Merge branch 'master' of https://github.com/miya-masa/dotFiles

Conflicts:
	_vimrc