asdsadas
Merge branch 'master' of https://github.com/elpikel/vim-tut

Conflicts:
	sebastian_globus.txt
Merge branch 'master' of https://github.com/elpikel/vim-tut