.
Merge branch 'master' of https://github.com/m-kraus/config

Conflicts:
	.vimrc