added new routes
Merge branch 'master' of github.com:cicadas-2014/percolator
voting
fixed merge
Merge pull request #38 from cicadas-2014/votes

Votes