added cart/modified all listings view
added cart model
merging conflicts