stashing things before merge, will do real commits in a minute
merged
Added update and destroy routes for post CONFLICT ALERT
MERGED YEAAAHAHAHAHAHAHAH
Merge pull request #5 from manspuri/features-votes-view

YESEEEEEEESSSSSASSSEESSES