add file6.txt
Merge branch 'miao'
update file1.txt