updating
Merge branch 'master' of github.com:jean377/dotfiles

Conflicts:
	.bash_it/.bash_profile

ý5:q