Merge branch 'master' of https://github.com/LukeShu/leaguer

Conflicts:
	app/controllers/matches_controller.rb
	app/views/matches/show.html.erb

1 files changed, 1 insertions, 1 deletions

diff --git a/generate.sh b/generate.sh
index e3e07f9..92e8299 100755
--- a/generate.sh
+++ b/generate.sh
@@ -17,7 +17,7 @@ bundle exec rails generate delayed_job:active_record
 
 # The whole shebang, models, views, and controllers
 bundle exec rails generate scaffold server default_user_permissions:integer
-bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string
+bundle exec rails generate scaffold match status:integer tournament:references name:string winner:references remote_id:string submitted_peer_evaluations:integer
 bundle exec rails generate scaffold team match:references
 bundle exec rails generate scaffold alert author:references message:text
 bundle exec rails generate scaffold pm author:references recipient:references message:text