Added a feature
resolve merge conflict
Second feature
Merge pull request #2 from morganrae/feature

Sweet Featurey Goodness