first commit to feature, fifth overall
second commit to feature, sixth overall
Merge pull request #1 from aviindub/feature

merging feature in to dev