auierstauienrtauie
Merge branch 'master' of https://github.com/smockey/dotfiles

Conflicts:
	vimrc