added new thing
Merge pull request #2 from ewbutterfield/eric-branch

added new thing