update
Merge branch 'master' of github.com:bcaccinolo/dotfiles

Conflicts:
	.bashrc