added boolean current to order
update Dee1 branch from master
added int qunatity attribute
updating DEE1 BRANCH
UPDATING DEE1
updated Dee branch by hand and added recieveOrder method to shopNoGui
amended invoiceTest and ShopNoGui to make GUI method
Created stockLiist, added constructor to Stock, loadStock method to
ShopNoGui
loadStock complete
Merge branch 'master' into Dee1

Conflicts:
	src/Invoice.java
	src/InvoiceTest.java
	src/Order.java
	src/Product.java
	src/Sale.java
	src/ShopNoGUI.java
	src/Stock.java
Merge branch 'Dee1'
Updated Again
Merge remote-tracking branch 'origin/Dee1'