Merge pull request #24 from aarondufall/votes

User model update and vote model update
Merge branch 'master' into votes
votes work for questions