moved the setting of a cart id and session cart id into the cart model
cart method for cart controller
moved add product to the cart controller
refactor
fixed merge conflict