solve a remaining merge conflict in the readme
Note about PROMPT_COMMAND
Merge branch 'master' of github.com:nojhan/liquidprompt
Display a yellow + if stashs

Add a yellow + after the git infos, if there is at least one stash.
The * in case of untracked file is now red.