added file 3
added file 4
Merge branch 'feature1'
added the name of file1.txt:
added the name of file2.txt