Conflicts: app/controllers/student_work_controller.rb db/schema.rb
Conflicts: db/schema.rb public/stylesheets/project.css
Conflicts: app/views/layouts/base_org2.html.erb
Conflicts: app/helpers/organizations_helper.rb app/views/layouts/base_org2.html.erb app/views/organizations/_org_content.html.erb
Conflicts: app/views/layouts/new_base_user.html.erb