Update from Shane
Merge branch 'master' into Shane

Conflicts:
	src/Shop.java
	src/StockTest.java
ShopNoGUI added Users,Login and Main Menu for both Admin and User.
Merge branch 'master' of https://github.com/fcpteam1/project
ShopNoGUI update and Supplier Number and Address added
View Customer list added in Customer Menu
Merge branch 'master' into Dee

Conflicts:
	CustomerList
	DublinFruitMarketList
	KeelingsProductList
	SuppliersProductListFiles
	UserList
	WexfordFFProductList
	src/ShopNoGUI.java
	src/Supplier.java