fgarbagnati/ratings-system — pull request #21 by fgarbagnati (2014-07-29 21:37:58+00:00)
Title: Merge pull request #19 from fgarbagnati/master

fixing weird merge issues