remove and add
Merge branch 'master' of github.com:timfeirg/workspace-setup

Conflicts:
	.vimrc