ok
Merge branch 'master' of https://github.com/GustavePate/dotfiles

Conflicts:
	dotfiles/.vimrc

ok