by Chris, 2014_10_30.txt, check-in test
Merge branch 'master' of https://github.com/7starspring/guide
first commit