Modify gitstatus.sh to detect local branch without tracking remote
Merge pull request #61 from MatiasFernandez/mark_local_branch

Modify gitstatus.sh to detect local branch without tracking remote
Update gitprompt.sh

Remove trailing whitespaces
Merge pull request #62 from ChoiZ/patch-2

Update gitprompt.sh
Merge remote-tracking branch 'upstream/master'