Added files that also are impacted
added files that are impacted
Merge pull request #4 from maheshghanta/Cart_Features

Cart features
Merge branch 'master' into ravi_work

Conflicts:
	app/controllers/application_controller.rb