Some new awesome feature
Merge branch 'master' into newFeature
edit foo
bllfaw