Trying to fix the bad merge
Merge branch 'staging'

Conflicts:
	app/controllers/products_controller.rb
Finally, fixed master/staging merging issue.  All to add one stinking print statement
Merge branch 'staging'

 I'm just trying to add one stinking print statement!!!!