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

Conflicts:
	config/routes.rb

1 files changed, 7 insertions, 0 deletions

diff --git a/test/models/user_tournament_pair_test.rb b/test/models/user_tournament_pair_test.rb
new file mode 100644
index 0000000..6167ff6
--- /dev/null
+++ b/test/models/user_tournament_pair_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTournamentPairTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end