change
Merge branch 'good-change' into dev

Conflicts:
	app/controllers/checkouts_controller.rb