Added feature1
Added feature 2
Added additional features to feature2
Merged feature2_additional into master
Added feature3
Fixed bug
Another fix bug 1234
Added fix1
Added fix2
Added fix2 to master
merged fix1