Merge branch 'clean2'

Conflicts:
	app/controllers/tournaments_controller.rb
	app/models/match.rb
	app/views/matches/index.html.erb
	app/views/matches/show.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/show.html.erb

1 files changed, 1 insertions, 2 deletions

diff --git a/app/models/match.rb b/app/models/match.rb
index ac74fe1..e37f9dc 100644
--- a/app/models/match.rb
+++ b/app/models/match.rb
@@ -1,5 +1,5 @@
 class Match < ActiveRecord::Base
-	belongs_to :tournament
+	belongs_to :tournament_stage
 	has_many :scores
 	has_and_belongs_to_many :teams
 
@@ -37,5 +37,4 @@ class Match < ActiveRecord::Base
 		end #while
 	end
 	#handle_asynchronously :is_match_over
-
 end