Update .bash_profile
Merge branch 'master' of https://github.com/al333z/dotfiles

Conflicts:
	.bash_profile