saving changes before pulling master.
Merge branch 'master' of github.com:wvmitchell/sales_engine

Conflicts:
	lib/invoice_item.rb
Tested and completed Customer#transactions and Customer#favorite_merchant