updated
Merge branch 'master' of https://github.com/rvalente/dotfiles

Conflicts:
	bashrc