fgarbagnati/ratings-system — pull request #15 by fgarbagnati (2014-07-29 21:36:00+00:00)
Title: Merge pull request #14 from fgarbagnati/master

fixing weird merge issues