oh hey
Merge branch 'master' of https://github.com/DelvarWorld/configs

Conflicts:
	.vimrc