Merge pull request #3 from shanswami/master

jshint stuff fixed
starts building destroy functionality and adds votes to current view
fixes merge conflict
fixes last merge conflict
Merge pull request #4 from biversen21/master

starts building destroy functionality and adds votes to current view