omg, I really need to organize this...
Merge branch 'master' of github.com:ricardovaleriano/.dotfiles

Conflicts:
	bash_profile/git
	bash_profile/variables
	vimfiles
	vimfiles/.gvimrc
	vimfiles/.vimrc