Changed gem file
Merged conlfict
Merge pull request #1 from mattleonard/matt-branch

Changed gem file