Bunty's commit
Merge remote-tracking branch 'origin/feature1' into feature1
pushing G1 to master
Merge remote-tracking branch 'remotes/origin/feature2' into feature1