Added some text in file1.txt.
Added empty file file2.txt.
Added some text in file2.text.
Merge branch 'myfeature' into develop
Merge branch 'release-1.1'