Created a file for feature2
Merge branch 'feature2' into development
added feature 3
Had to make small change to feature2 to work with feature3
Merge branch 'feature3' into development