Added Feature1
Added Feature2
Added additional features to feature2
Merged feature2_additional into master
Added feature3