modified file test2.txt
added first feature
Merge branch 'firstfeature' into develop
first release
Merge branch 'release-1.0'