Friday night's class
Conflicts:
	spec/features/cart_spec.rb
Saturday Material