Conflicts: Gemfile Gemfile.lock app/models/group.rb app/views/layouts/application.html.haml db/schema.rb public/stylesheets/git/style.css