Merge pull request #23 from cblokker/votes

made some style changes
Merge pull request #24 from cblokker/votes

Votes
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes