remove merge conflict
Merge pull request #15 from rootulp/fix_gemfile

remove merge conflict