From 5021d01548dd7b9d0080fc69c782f23bfb9a4620 Mon Sep 17 00:00:00 2001
From: Tomer Kimia <tkimia@purdue.edu>
Date: Fri, 28 Feb 2014 17:30:02 -0500
Subject: fixed db/seeds.rb and tried to get the game... did not succeed

---
 app/controllers/tournaments_controller.rb | 2 +-
 db/seeds.rb                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 86b869b..56233b6 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -14,7 +14,7 @@ class TournamentsController < ApplicationController
 
   # GET /tournaments/new
   def new
-    @game_names = Game.all
+    @game_names = Game.all.collect
     @tournament = Tournament.new
   end
 
diff --git a/db/seeds.rb b/db/seeds.rb
index 58c9eba..ab130a8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -6,6 +6,6 @@
 #   cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
 #   Mayor.create(name: 'Emanuel', city: cities.first)
 #
-league = Game.create([{name: "League of Legends"}, {players_per_team: 5}, {teams_per_match: 2}, {set_rounds: 1}, {randomized_teams: 0}])
+Game.create(name: "League of Legends", players_per_team: 5, teams_per_match: 2, set_rounds: 1, randomized_teams: 0)
 
 
-- 
cgit v1.2.3-54-g00ecf


From e9015aebe596b2b315617e38cc7f04c5c23718d9 Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Sat, 1 Mar 2014 19:56:04 -0500
Subject: I added a start.sh file so that you can just type ./start.sh to both
 generate and start the server.

---
 start.sh | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100755 start.sh

diff --git a/start.sh b/start.sh
new file mode 100755
index 0000000..c03361e
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+generate.sh
+bundle exec rails server &
+
-- 
cgit v1.2.3-54-g00ecf


From 76f7a694f9c171270921a2ae7d4b0be6a9ee7f5d Mon Sep 17 00:00:00 2001
From: AndrewMurrell <amurrel@purdue.edu>
Date: Sat, 1 Mar 2014 19:59:36 -0500
Subject: Made the start script sent 2> to a file called server.talk for later
 reference.

---
 start.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/start.sh b/start.sh
index c03361e..01b7f72 100755
--- a/start.sh
+++ b/start.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 generate.sh
-bundle exec rails server &
+bundle exec rails server 2> server.talk &
 
-- 
cgit v1.2.3-54-g00ecf