resolved merge conflicts
implemented email delivery for user deletion
fixed merge conflict
fixed voting feature tests
Fixed admin notes
Merge pull request #19 from LaunchAcademy/added_user_voting

Added user voting
Merge branch 'master' into Fixing_admin_notes
resolve merge conflict & merge in master
fixed a thing