StockSalesPrediction updated
Changes to Proft,Sale and Expenses
classpath
Merge branch 'master' into Shane

Conflicts:
	src/GUI/FinancialMainPanel.java
	src/GUI/FinancialTablePanel.java
	src/GUI/FinancialTextPanel.java
	src/model/StockSalesPredictor.java
	stocks.ser

Conflicts fixed
Merge branch 'master' into Shane

Conflicts:
	stocks.ser
fixed
Merge branch 'master' into Shane

Conflicts:
	orders.ser
	sales.ser
	src/GUI/CustomerTablePanel.java
	src/model/Shop.java
	stocks.ser
	
Fixed Conflicts
Merge branch 'master' into Shane

Conflicts:
	orders.ser
	sales.ser

Conflcits fixed
Changes to graphs.
Graphs changed to show correct data