added colors & git branch