Added feature 4
Fixed bug 1 for test feature2
Merge branch 'testfeature4'
Merge branch 'testbugfix1'