Added Feature1
Added Feature 2
Added Additional Features to feature 2
Merged feature2Additional into master
Added fix1
Added fix2
Added fix1
Merge branch 'v1.0_fixes'