Merge pull request #1 from fanrong126/patch-1

Update svn增加的文件.txt
Delete svn增加的文件.txt
Merge pull request #2 from fanrong126/patch-2

Delete svn增加的文件.txt
32123
126
Merge remote-tracking branch 'origin/master' into patch-1