Adding a new file to feature2 branch.
Making a change on feature2 after a commit on master but before any
merging.
Changing masterfile on the master branch.
Merge pull request #1 from geocent-yancy/feature2

Pull request comment