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 pull request #15 from cblokker/votes

changing css. the colors are temporary.
fixed merge conflicts