Bash pretty prompt
Merge branch 'master' of https://www.github.com/rveens/dotfiles

Conflicts:
	bash/.bashrc