Blabla
Merge branch 'master' into nojedi

Conflicts:
	vimrc