Added feature1
Fixed bug 1
Added feature 2
Really fixing 1234 now
Added additional features to feature2
Merged feature2_additional into master
Added feature 3
Fixed feature3 code
merged conflicts from bug 1234 fix