Cart Issues Fixed
Merge pull request #3 from maheshghanta/Cart_Features

Cart Issues Fixed
Merge branch 'master' into ravi_work

Conflicts:
	app/controllers/application_controller.rb