foo
copied from some other machine
Merge remote-tracking branch 'origin/master'

Conflicts:
	vim/vimrc