Merge branch 'clean2'

Conflicts:
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb

1 files changed, 2 insertions, 1 deletions

diff --git a/db/schema.rb b/db/schema.rb
index df3d690..9dbf69a 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140407000143) do
+ActiveRecord::Schema.define(version: 20140407081524) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
@@ -76,6 +76,7 @@ ActiveRecord::Schema.define(version: 20140407000143) do
     t.string   "name"
     t.integer  "winner_id"
     t.string   "remote_id"
+    t.integer  "submitted_peer_evaluations"
     t.datetime "created_at"
     t.datetime "updated_at"
   end