Update Gemfile
OMG fixed those merge conflicts
Merge pull request #2 from mattleonard/logan-branch

Update Gemfile