working on feature 1
working on feature 2
Merge branch 'master' into feature2