implemented CA
updated workspace file
CONFLICT RESOLVED
Merge remote-tracking branch 'origin/master'
updated user model