test case updated
Merge branch 'master' of https://github.com/TrainingCourse/13-Web-113

Conflicts:
	app/views/carts/show.html.erb
Merge branch 'master' of https://github.com/TrainingCourse/13-Web-113