Merge branch 'yuanke' into develop

db/migrate/20160330094039_add_simi_id_to_homeworks.rb

@@ -1,6 +0,0 @@
-class AddSimiIdToStudentWorks < ActiveRecord::Migration
-  def change
-    add_column :student_works, :simi_id, :integer, :default => false
-    add_column :student_works, :simi_value, :integer, :default => false
-  end
-end

db/migrate/20160414055511_add_simi_id_to_student_works.rb

@@ -0,0 +1,6 @@
+class AddSimiIdToStudentWorks < ActiveRecord::Migration
+  def change
+    add_column :student_works, :simi_id, :integer
+    add_column :student_works, :simi_value, :integer
+  end
+end