first commit of theNewFeature2
first commit of theNewFeature2
first commit after rebasing
fixed merge conflicts
Merge pull request #1 from stepthom/newFeature2

New feature2