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

cleaned up the login signup views by adding placeholders
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.
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
Merge pull request #16 from ryanstorberg/master

begin defining the aesthetics; add most popular to debates index; add mo...
fix nav; start working on newspaper-like theme
Merge pull request #17 from ryanstorberg/master

fix nav; start working on newspaper-like theme
begin work on simplified newspaper/daily theme; add recent & popular debate lists to index; fix css problem where page doesn't scroll
Merge pull request #18 from ryanstorberg/master

begin work on simplified newspaper/daily theme; add recent & popular deb...
fix floating with debate lists
Merge pull request #19 from ryanstorberg/master

fix floating with debate lists
add sorted recent column