Merge branch 'clean4'

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/assets/stylesheets/static.css.scss
	app/controllers/sessions_controller.rb
	app/controllers/static_controller.rb
	app/controllers/tournaments_controller.rb
	app/controllers/users_controller.rb
	app/helpers/sessions_helper.rb
	app/models/game.rb
	app/models/user.rb
	app/views/games/index.html.erb
	app/views/tournaments/index.html.erb
	app/views/tournaments/new.html.erb
	app/views/users/_form.html.erb
	app/views/users/index.html.erb
	app/views/users/index.json.jbuilder
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	app/views/users/show.json.jbuilder
	config/routes.rb
	generate.sh

11 files changed, 32 insertions, 0 deletions

diff --git a/app/models/alert.rb b/app/models/alert.rb
new file mode 100644
index 0000000..343c269
--- /dev/null
+++ b/app/models/alert.rb
@@ -0,0 +1,3 @@
+class Alert < ActiveRecord::Base
+  belongs_to :author
+end
diff --git a/app/models/game_attribute.rb b/app/models/game_attribute.rb
new file mode 100644
index 0000000..c12723b
--- /dev/null
+++ b/app/models/game_attribute.rb
@@ -0,0 +1,3 @@
+class GameAttribute < ActiveRecord::Base
+  belongs_to :game
+end
diff --git a/app/models/match.rb b/app/models/match.rb
new file mode 100644
index 0000000..533435a
--- /dev/null
+++ b/app/models/match.rb
@@ -0,0 +1,3 @@
+class Match < ActiveRecord::Base
+  belongs_to :tournament
+end
diff --git a/app/models/pm.rb b/app/models/pm.rb
new file mode 100644
index 0000000..ab5af3b
--- /dev/null
+++ b/app/models/pm.rb
@@ -0,0 +1,4 @@
+class Pm < ActiveRecord::Base
+  belongs_to :author
+  belongs_to :recipient
+end
diff --git a/app/models/server.rb b/app/models/server.rb
new file mode 100644
index 0000000..120f0fa
--- /dev/null
+++ b/app/models/server.rb
@@ -0,0 +1,2 @@
+class Server < ActiveRecord::Base
+end
diff --git a/app/models/server_settings.rb b/app/models/server_settings.rb
new file mode 100644
index 0000000..7f49863
--- /dev/null
+++ b/app/models/server_settings.rb
@@ -0,0 +1,2 @@
+class ServerSettings < ActiveRecord::Base
+end
diff --git a/app/models/team.rb b/app/models/team.rb
new file mode 100644
index 0000000..fa7ba9e
--- /dev/null
+++ b/app/models/team.rb
@@ -0,0 +1,2 @@
+class Team < ActiveRecord::Base
+end
diff --git a/app/models/team_match_pair.rb b/app/models/team_match_pair.rb
new file mode 100644
index 0000000..85f8eaa
--- /dev/null
+++ b/app/models/team_match_pair.rb
@@ -0,0 +1,4 @@
+class TeamMatchPair < ActiveRecord::Base
+  belongs_to :team
+  belongs_to :match
+end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
new file mode 100644
index 0000000..cc915a0
--- /dev/null
+++ b/app/models/tournament.rb
@@ -0,0 +1,3 @@
+class Tournament < ActiveRecord::Base
+  belongs_to :game
+end
diff --git a/app/models/tournament_option.rb b/app/models/tournament_option.rb
new file mode 100644
index 0000000..950b351
--- /dev/null
+++ b/app/models/tournament_option.rb
@@ -0,0 +1,2 @@
+class TournamentOption < ActiveRecord::Base
+end
diff --git a/app/models/user_team_pair.rb b/app/models/user_team_pair.rb
new file mode 100644
index 0000000..c55dc2e
--- /dev/null
+++ b/app/models/user_team_pair.rb
@@ -0,0 +1,4 @@
+class UserTeamPair < ActiveRecord::Base
+  belongs_to :user
+  belongs_to :team
+end