Merge pull request #2 from sz1-xiaoxli/master

pull a new request
Merge pull request #3 from sz1-xiaoxli/master

merge: added a new file for story#3
Merge pull request #4 from sz1-xiaoxli/master

Add new lin for story#4589
Merge pull request #5 from sz1-xiaoxli/master

user#123 udate test.txt
Merge branch 'temp'