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