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

Conflicts:
	config/routes.rb

1 files changed, 5 insertions, 7 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 178b7ad..5c5bece 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,19 +7,17 @@ Leaguer::Application.routes.draw do
 
   resources :games
 
-  resources :tournaments
-
   resources :pms
 
   resources :alerts
 
-  resources :teams
-
-  resources :matches
+  resource :server, only: [:show, :edit, :update]
 
-  resources :tournaments
+  resources :teams
+  resources :tournaments do
+    resources :matches
+  end
 
-  resource :server, only: [:show, :edit, :update]
 
   root to: 'static#homepage'