Niall comments
fixed sale problem
Comments
Merge branch 'master' into Deirdre

Conflicts:
	orders.ser
	sales.ser
	stocks.ser
niall comments
classpath fixed
Merge branch 'master' into darren

Conflicts:
	orders.ser
	src/GUI/SaleMainPanel.java
	stocks.ser