Adds favorite_merchant final
Merge branch 'development' of github.com:MarcGarreau/sales_engine into development

Conflicts:
	lib/customer.rb