Nice PS1
Merge branch 'master' of github.com:gittan/work_config

Conflicts:
	.bashrc