Fix git checkout problem
Merge branch 'master' into papa
Merge branch 'master' into papa
Merge branch 'master' into papa
Add .git-prompt.sh
1. add ignore file
2. add auto-load file function