pending votes
resolved merge conflicts
created like functionality
Merge pull request #10 from fox-squirrels-2013/creating_votes

Creating votes