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

fixing weird merge issues