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

Conflicts:
	app/controllers/sessions_controller.rb
	app/views/sessions/new.html.erb

3 files changed, 15 insertions, 1 deletions

diff --git a/test/models/game_attribute_test.rb b/test/models/game_option_test.rb
index 13c6e65..1ae5701 100644
--- a/test/models/game_attribute_test.rb
+++ b/test/models/game_option_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class GameAttributeTest < ActiveSupport::TestCase
+class GameOptionTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end
diff --git a/test/models/score_test.rb b/test/models/score_test.rb
new file mode 100644
index 0000000..d38cb0a
--- /dev/null
+++ b/test/models/score_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ScoreTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/models/tournament_user_pair_test.rb b/test/models/tournament_user_pair_test.rb
new file mode 100644
index 0000000..c8d1789
--- /dev/null
+++ b/test/models/tournament_user_pair_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class TournamentUserPairTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end