Add karma to users; Increment karma based on votes received; Create partial to display user name and karma
Resolve merge conflict