Added TestStock and TestSupplier classes,
Stock update: changed StockLevels method
Changed Product to only have name and supplier price.
Changed Stock to be a subclass of Product
Merge branch 'christine' of https://github.com/fcpteam1/project into
christine

Conflicts:
	.classpath
	src/Product.java
	src/Stock.java
	src/StockTest.java
	src/Supplier.java
	src/SupplierTest.java
Removed duplicate methods from merge
StockGui added
Fixed stockLevels method to get total of duplicate stock items
Changes to product and Stock.stockLevels
Merge branch 'master' into christine

Conflicts:
	src/Controller.java
	src/MainMenuGUI.java
	src/Product.java
	src/Stock.java
	src/Supplier.java
Changed stockGui to include button to remove out of stock items
Changes to createSale in Shop and createSaleOccured in saleMainPanel
Merge branch 'christine' of https://github.com/fcpteam1/project into christine
Merge branch 'christine' of https://github.com/fcpteam1/project into
christine

Conflicts:
	.classpath
	orders.ser
	sales.ser
	src/GUI/SaleMainPanel.java
	src/GUI/StockGUI.java
	stocks.ser
Refresh View Stock when order or sale is processed
Merge branch 'christine' of https://github.com/fcpteam1/project into
christine

Conflicts:
	.classpath
	orders.ser
	sales.ser
	src/GUI/StockGUI.java
	src/model/Shop.java
	stocks.ser
Merge remote-tracking branch 'origin/christine'

Conflicts:
	orders.ser
	sales.ser
	stocks.ser