Adds karma
Merge branch 'karma_stuff'
Adds karma fields for the user