Added feature one
Commit after git reset --hard
Two commits after reset
Merge pull request #3 from deanefrati/feature-one

Feature one pull request