better prompt
Merge branch 'master' of https://github.com/lennart96/scripts

edited shrc from two different locations