Added upvotes table and relevant tests.
Fixed merge conflicts
Fixed some merge conflicts in db/schema.rb