user can create a review
user can edit his reviews
Resolve merge conflict & merge in master
addressed helen's comments
fixed merge conflict