project->项目动态
Conflicts: app/controllers/words_controller.rb
Conflicts: db/schema.rb
Conflicts: app/helpers/application_helper.rb public/stylesheets/courses.css public/stylesheets/new_user.css
Conflicts: app/views/sub_document_comments/show.html.erb