Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge pull request #21 from ryanstorberg/master

fix double column layout issue when columns weren't of equal length in i...
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
updated seed file.  Commented out seed code related to vote counts because number of votes wasn't matching up with the sum of votes on comments.
Merge pull request #22 from cblokker/votes

Votes
made some style changes
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge pull request #23 from cblokker/votes

made some style changes
more styling on debates/show.html.erb
Merge pull request #24 from cblokker/votes

Votes
created partials for votes form and comments form
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge pull request #26 from cblokker/votes

Votes
a user can now select a topic when they create a debate
Merge pull request #27 from cblokker/votes

a user can now select a topic when they create a debate
some design of the debate show page
Merge pull request #28 from cblokker/votes

some design of the debate show page
fixed bug in login system