Added feature 1
added feature 2
added additional features to feature 2
Merged feature2_additional into master
Added feature 3
Fixed bug 1234
really fixing bug 1234
resolved v1.0 fixes cnflict