added feature1
Fixed bug#1234
added feature 2
realling fixing bug1234
Added additional features to feature2
bla
Merge branch 'feature2_additional'
Merged featrue2 into master
added feature 3