edit the gemfile
Merge branch 'master' of https://github.com/rokkit/taxi