Merge pull request #9 from friends110110/master

let us start now
Update 1.txt
merge
asdf

asdf
Merge branch 'merge-master'