jiwu's first commit
Merge branch 'master' of github.com:/SparkSprings/test_text_repo