gemfile
removed gemfile conflicts
voting on answers
Merge branch 'master' of https://github.com/island-foxes-2013/groverflow