added upvote/downvote function
merge conflicts