a.txt added
b.txt added
c.txt added
d.txt added
Merge branch 'myfeature' into develop
Bumped version number to 1.2
small fix
Merge branch 'release-1.2'