Add file1.txt
Merge branch 'dev'