added changes for future merge conflict
Merge branch 'master' into step_7

Conflicts:
	app/controllers/products_controller.rb