Updating Votes stuff
fixing merge conflicts
votes are working
something is fucked up
Merge branch 'master' of https://github.com/BU-ZY/buzy