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

2 files changed, 3 insertions, 3 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2abc93e..6436e4e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,7 +8,7 @@ class UsersController < ApplicationController
     @user = User.new(user_params)
     if @user.save
       sign_in @user
-      #redirect_to root_path
+      redirect_to root_path
     else
       render 'new'
     end
diff --git a/config/routes.rb b/config/routes.rb
index cbe6c2f..8a06cff 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,12 +3,12 @@ Leaguer::Application.routes.draw do
 	#creates sessions as a resource but limits it to these actions
 	resources :sessions, only: [:new, :create, :destroy]
 
-  resources :users
-
 	match 'signup', to: 'users#new', via: 'get'
 	match 'signin', to: 'sessions#new', via: 'get'
 	match 'signout', to: 'sessions#destroy', via: 'delete'
 
+  resources :users
+
   resources :pms
 
   resources :alerts