add placeholder text in login form; add hidden password field in login form
update signup form; change root directory; fix bugs
added basic vote functionality
Merge pull request #10 from cblokker/votes

added basic vote functionality
the user can now see the sum of votes for and votes against
Merge pull request #11 from cblokker/votes

the user can now see the sum of votes for and votes against
created some links in a nav at top of page.  should make that a partial.
cleaned up the login signup views by adding placeholders
Merge pull request #12 from cblokker/votes

cleaned up the login signup views by adding placeholders
added some css. Maybe we should give it some sass!
Merge pull request #13 from cblokker/votes

added some css. Maybe we should give it some sass!
misc
fixed merge conflicts
Merge pull request #14 from ryanstorberg/master

i think chase and i worked on some of the same stuff. we should probably try to organize and detail our trello cards a bit better.
changing css. the colors are temporary.
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
Merge pull request #15 from cblokker/votes

changing css. the colors are temporary.
Merge branch 'master' of https://github.com/woolly-bear-caterpillars-2014/debate_platform into votes
begin defining the aesthetics; add most popular to debates index; add most recent to debates index
fixed merge conflicts