resolved merge conflicts
fixed merge conflict
fixed voting feature tests
Merge pull request #19 from LaunchAcademy/added_user_voting

Added user voting
Merge branch 'master' into Fixing_admin_notes