Added Feature 1
Added feature two
Merge branch 'feature1'
Merge branch 'feature2'