more work related stuff
Merge branch 'master' of https://github.com/tumdum/dot_files

Conflicts:
	.vimrc