Merge branch ‘master’ of https://git.trustie.net/shuowang/versionbase Conflicts:readme.txt
Merge branch ‘master’ of https://git.trustie.net/shuowang/versionbase
a demo used to learn git
