From 455fa5b30e224407e4fdca46d087ba300a050567 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Mon, 3 Mar 2014 14:09:32 -0500
Subject: Made it possible to log in from the sign up page. As in I put a link
 under the mess I made.

---
 app/views/users/new.html.erb | 5 ++++-
 generate.sh                  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 715d40e..2a745cc 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -54,4 +54,7 @@
   <p>
     <input name="commit" type="submit" value="Save User" />
   </p>
-</form>
\ No newline at end of file
+</form>
+
+<%= link_to 'Already Have an Account? Log in', "signin", :class => "btn btn-warning btn-lg" %>
+
diff --git a/generate.sh b/generate.sh
index 7f0467c..4d70de1 100755
--- a/generate.sh
+++ b/generate.sh
@@ -14,7 +14,7 @@ NOTEST='--skip-test-unit'
 
 set -x
 bundle exec rails generate scaffold server --force $NOTEST
-bundle exec rails generate scaffold tournament game:references --force $NOTEST
+bundle exec rails generate scaffold tournament game:references $NOTEST
 bundle exec rails generate scaffold match tournament:references name:string --force $NOTEST
 bundle exec rails generate scaffold team $NOTEST
 bundle exec rails generate scaffold alert author:references message:text $NOTEST
-- 
cgit v1.1-4-g5e80