added alias for pojrects folder
fixed merge conflict
fixed PS1 to properly show git branch

branch name change color if current repo is dirty