vimrc
Merge branch 'master' of github.com:optiminimalist/newdotfiles

Conflicts:
	vimrc