added columns to user (email,password_digest,name,karma)
schema merge conflict resolved