merging...
Merge branch 'master' of github.com:rodyo/bash_prompt
Fixed issue with display of file names containing percent signs.