Creating one line item in cart for more than one quantity of a particular product
Merged schema.rb
Merged Gemfile
Merged Michelle, Emily and my changes