update
Merge branch 'master' of http://github.com/horsetailfiddlehead/basic

make some changes to figure out __git_ps1 unrecongnized issue