fixed sale problem
Merge branch 'master' into Deirdre

Conflicts:
	orders.ser
	sales.ser
	stocks.ser