added upvote w/ ajax response
fixed conflicts
Merge pull request #46 from mreid1130/merging-conflicts

ok'd