modify the gemfile conflict by hx

Gemfile

@@ -44,13 +44,10 @@ group :development do
   gem 'grape-swagger'
   gem 'better_errors', '~> 1.1.0'
   gem 'rack-mini-profiler', '~> 0.9.3'
-<<<<<<< HEAD
-  #gem  'win32console'
-=======
   if RUBY_PLATFORM =~ /w32/
     gem  'win32console'
   end
->>>>>>> 1dae37f613838b2ada8b8f872abec71b256cb1ad
+
 end
 
 group :development, :test do 

db/schema.rb

@@ -1554,6 +1554,7 @@ ActiveRecord::Schema.define(:version => 20151217051447) do
   end
 
   add_index "student_works", ["homework_common_id", "user_id"], :name => "index_student_works_on_homework_common_id_and_user_id"
+  add_index "student_works", ["homework_common_id"], :name => "index"
 
   create_table "student_works_evaluation_distributions", :force => true do |t|
     t.integer  "student_work_id"