added git-prompt
add git prompt.
Merge branch 'master' into cygwin