passed comment tests, wrote failing vote test
Merge pull request #2 from jenwen/votes

passed comment tests, wrote failing vote test
fixed merge conflict with comments controller and factory girl tests