Feature B change
Merge branch 'master' into feature-b
Resolved conflict and added feature c
Merge pull request #4 from peter-tackage/feature-b

Feature b