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

15 files changed, 6 insertions, 1 deletions

diff --git a/db/migrate/20140304015246_create_servers.rb b/db/migrate/20140304015447_create_servers.rb
index f33241a..f33241a 100644
--- a/db/migrate/20140304015246_create_servers.rb
+++ b/db/migrate/20140304015447_create_servers.rb
diff --git a/db/migrate/20140304015248_create_tournaments.rb b/db/migrate/20140304015449_create_tournaments.rb
index 36fcf7e..36fcf7e 100644
--- a/db/migrate/20140304015248_create_tournaments.rb
+++ b/db/migrate/20140304015449_create_tournaments.rb
diff --git a/db/migrate/20140304015250_create_matches.rb b/db/migrate/20140304015452_create_matches.rb
index 6c0c157..6c0c157 100644
--- a/db/migrate/20140304015250_create_matches.rb
+++ b/db/migrate/20140304015452_create_matches.rb
diff --git a/db/migrate/20140304015252_create_teams.rb b/db/migrate/20140304015454_create_teams.rb
index dd8397d..dd8397d 100644
--- a/db/migrate/20140304015252_create_teams.rb
+++ b/db/migrate/20140304015454_create_teams.rb
diff --git a/db/migrate/20140304015254_create_users.rb b/db/migrate/20140304015456_create_users.rb
index 6a500e5..6a500e5 100644
--- a/db/migrate/20140304015254_create_users.rb
+++ b/db/migrate/20140304015456_create_users.rb
diff --git a/db/migrate/20140304015257_create_user_team_pairs.rb b/db/migrate/20140304015458_create_user_team_pairs.rb
index 2c492ac..2c492ac 100644
--- a/db/migrate/20140304015257_create_user_team_pairs.rb
+++ b/db/migrate/20140304015458_create_user_team_pairs.rb
diff --git a/db/migrate/20140304015259_create_team_match_pairs.rb b/db/migrate/20140304015500_create_team_match_pairs.rb
index 8fac07e..8fac07e 100644
--- a/db/migrate/20140304015259_create_team_match_pairs.rb
+++ b/db/migrate/20140304015500_create_team_match_pairs.rb
diff --git a/db/migrate/20140304015301_create_alerts.rb b/db/migrate/20140304015502_create_alerts.rb
index 68a8e10..68a8e10 100644
--- a/db/migrate/20140304015301_create_alerts.rb
+++ b/db/migrate/20140304015502_create_alerts.rb
diff --git a/db/migrate/20140304015303_create_pms.rb b/db/migrate/20140304015505_create_pms.rb
index 93bb5c6..93bb5c6 100644
--- a/db/migrate/20140304015303_create_pms.rb
+++ b/db/migrate/20140304015505_create_pms.rb
diff --git a/db/migrate/20140304015306_create_games.rb b/db/migrate/20140304015507_create_games.rb
index 59d4ef0..59d4ef0 100644
--- a/db/migrate/20140304015306_create_games.rb
+++ b/db/migrate/20140304015507_create_games.rb
diff --git a/db/migrate/20140304015308_create_game_attributes.rb b/db/migrate/20140304015509_create_game_attributes.rb
index b63f134..b63f134 100644
--- a/db/migrate/20140304015308_create_game_attributes.rb
+++ b/db/migrate/20140304015509_create_game_attributes.rb
diff --git a/db/migrate/20140304015310_create_server_settings.rb b/db/migrate/20140304015511_create_server_settings.rb
index dfdd91b..dfdd91b 100644
--- a/db/migrate/20140304015310_create_server_settings.rb
+++ b/db/migrate/20140304015511_create_server_settings.rb
diff --git a/db/migrate/20140304015316_create_tournament_options.rb b/db/migrate/20140304015517_create_tournament_options.rb
index d2df22e..d2df22e 100644
--- a/db/migrate/20140304015316_create_tournament_options.rb
+++ b/db/migrate/20140304015517_create_tournament_options.rb
diff --git a/db/schema.rb b/db/schema.rb
index 264a347..41dac9e 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140304015316) do
+ActiveRecord::Schema.define(version: 20140304015517) do
 
   create_table "alerts", force: true do |t|
     t.integer  "author_id"
diff --git a/start.sh b/start.sh
new file mode 100755
index 0000000..01b7f72
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+generate.sh
+bundle exec rails server 2> server.talk &
+