Merge pull request #7 from friends110110/master

merge
Update 1.txt
fff