Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
more styling on debates/show.html.erb
Merge pull request #24 from cblokker/votes

Votes