Merge branch 'clean2'

Conflicts:
	app/models/game.rb

2 files changed, 2 insertions, 1 deletions

diff --git a/app/models/game.rb b/app/models/game.rb
index 345877e..5f4c46d 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,3 +1,5 @@
 class Game < ActiveRecord::Base
+	belongs_to :parent, class_name: "Game"
+	has_many :children, class_name: "Game"
 	has_many :settings, class_name: "GameSetting"
 end
diff --git a/app/models/game_setting.rb b/app/models/game_setting.rb
index e6d43e5..bff8d97 100644
--- a/app/models/game_setting.rb
+++ b/app/models/game_setting.rb
@@ -1,4 +1,3 @@
 class GameSetting < ActiveRecord::Base
 	belongs_to :game
-	belongs_to :parent
 end