vim bla
git bla
Merge branch 'master' of github.com:keks-/dotfiles

Conflicts:
	vim/vimrc

helloy
updating vim plugins
added muennichs colorscheme bored