update
Merge branch 'master' of https://github.com/kiiiyo/dotfiles

Conflicts:
	_vimrc