New PS1
Merge branch 'master' of github.com:magiccyril/dotfiles

Conflicts:
	.bash_profile