Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/match.rb

1 files changed, 15 insertions, 0 deletions

diff --git a/lib/scoring_algorithms/MarginalPeer.rb b/lib/scoring_algorithms/MarginalPeer.rb
new file mode 100644
index 0000000..0e1cfa8
--- /dev/null
+++ b/lib/scoring_algorithms/MarginalPeer.rb
@@ -0,0 +1,15 @@
+require 'ScoringAlgorithm'
+
+class MarginalPeer < ScoringAlgorithm
+
+	def self.score(match, interface)
+		match.players.each do |player|
+			scores[player.user_name] = scoreUser(interface.getStatistic(match, player, rating))
+		end
+		scores
+	end
+
+	def self.score(rating)
+		rating
+	end
+end
\ No newline at end of file