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

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/layouts/application.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb

13 files changed, 48 insertions, 0 deletions

diff --git a/test/helpers/.keep b/test/helpers/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/test/helpers/.keep
diff --git a/test/helpers/alerts_helper_test.rb b/test/helpers/alerts_helper_test.rb
new file mode 100644
index 0000000..1d9079d
--- /dev/null
+++ b/test/helpers/alerts_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class AlertsHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/games_helper_test.rb b/test/helpers/games_helper_test.rb
new file mode 100644
index 0000000..449a85c
--- /dev/null
+++ b/test/helpers/games_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class GamesHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/main_helper_test.rb b/test/helpers/main_helper_test.rb
new file mode 100644
index 0000000..22da3c4
--- /dev/null
+++ b/test/helpers/main_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MainHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/matches_helper_test.rb b/test/helpers/matches_helper_test.rb
new file mode 100644
index 0000000..4cc472f
--- /dev/null
+++ b/test/helpers/matches_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class MatchesHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/pms_helper_test.rb b/test/helpers/pms_helper_test.rb
new file mode 100644
index 0000000..af80f10
--- /dev/null
+++ b/test/helpers/pms_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class PmsHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/search_helper_test.rb b/test/helpers/search_helper_test.rb
new file mode 100644
index 0000000..3034163
--- /dev/null
+++ b/test/helpers/search_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SearchHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/servers_helper_test.rb b/test/helpers/servers_helper_test.rb
new file mode 100644
index 0000000..8fddf34
--- /dev/null
+++ b/test/helpers/servers_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class ServersHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/sessions_helper_test.rb b/test/helpers/sessions_helper_test.rb
new file mode 100644
index 0000000..7d44e09
--- /dev/null
+++ b/test/helpers/sessions_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class SessionsHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/static_helper_test.rb b/test/helpers/static_helper_test.rb
new file mode 100644
index 0000000..3b96f2b
--- /dev/null
+++ b/test/helpers/static_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class StaticHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/teams_helper_test.rb b/test/helpers/teams_helper_test.rb
new file mode 100644
index 0000000..b736483
--- /dev/null
+++ b/test/helpers/teams_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TeamsHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/tournaments_helper_test.rb b/test/helpers/tournaments_helper_test.rb
new file mode 100644
index 0000000..1cf5269
--- /dev/null
+++ b/test/helpers/tournaments_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class TournamentsHelperTest < ActionView::TestCase
+end
diff --git a/test/helpers/users_helper_test.rb b/test/helpers/users_helper_test.rb
new file mode 100644
index 0000000..96af37a
--- /dev/null
+++ b/test/helpers/users_helper_test.rb
@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class UsersHelperTest < ActionView::TestCase
+end