Adding votes for tricks
Fixing conflicts
Merge pull request #19 from railsrumble/ratings

Adding votes for tricks