spaces, spaces everywhere
Merge branch 'master' of github:yogsototh/Vim-configuration

Conflicts:
	vimrc