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

fixing weird merge issues