Added feature 1
Added Feature2
Merge branch 'feature1'
Merge branch 'feature2'