edited file1, adding file8
Merge branch 'longwencan-edit1'