Feature A change
Merge branch 'master' into feature-a
Merge pull request #3 from peter-tackage/feature-a

Feature a
Resolved conflict and added feature c