Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

1 files changed, 34 insertions, 34 deletions

diff --git a/config/routes.rb b/config/routes.rb
index 8a06cff..bc995e3 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,8 @@ Leaguer::Application.routes.draw do
 
   resources :users
 
+  resources :games
+
   resources :pms
 
   resources :alerts
@@ -21,8 +23,6 @@ Leaguer::Application.routes.draw do
 
   resources :servers
 
-  resources :games
-
   root to: 'static#homepage'
 
   # The priority is based upon order of creation: first created -> highest priority.
@@ -32,51 +32,51 @@ Leaguer::Application.routes.draw do
   # root 'welcome#index'
 
   # Example of regular route:
-  # get 'products/:id' => 'catalog#view'
+  #   get 'products/:id' => 'catalog#view'
 
   # Example of named route that can be invoked with purchase_url(id: product.id)
-  # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
+  #   get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
 
   # Example resource route (maps HTTP verbs to controller actions automatically):
-  # resources :products
+  #   resources :products
 
   # Example resource route with options:
-  # resources :products do
-  # member do
-  # get 'short'
-  # post 'toggle'
-  # end
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
   #
-  # collection do
-  # get 'sold'
-  # end
-  # end
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
 
   # Example resource route with sub-resources:
-  # resources :products do
-  # resources :comments, :sales
-  # resource :seller
-  # end
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
 
   # Example resource route with more complex sub-resources:
-  # resources :products do
-  # resources :comments
-  # resources :sales do
-  # get 'recent', on: :collection
-  # end
-  # end
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', on: :collection
+  #     end
+  #   end
 
   # Example resource route with concerns:
-  # concern :toggleable do
-  # post 'toggle'
-  # end
-  # resources :posts, concerns: :toggleable
-  # resources :photos, concerns: :toggleable
+  #   concern :toggleable do
+  #     post 'toggle'
+  #   end
+  #   resources :posts, concerns: :toggleable
+  #   resources :photos, concerns: :toggleable
 
   # Example resource route within a namespace:
-  # namespace :admin do
-  # # Directs /admin/products/* to Admin::ProductsController
-  # # (app/controllers/admin/products_controller.rb)
-  # resources :products
-  # end
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
 end