added guicolorscheme
Merge branch 'master' of https://github.com/gerardoausere/dotfiles

Conflicts:
	_vimrc