fix
oh crap
Merge branch 'master' of https://github.com/nandryshak/dotfiles

Conflicts:
	.gvimrc
	.vim/functions.vim