Update from Shane
Merge branch 'master' into Shane

Conflicts:
	src/Shop.java
	src/StockTest.java
Pre merge commit
Merge branch 'master' into niall2
Merge branch 'master' into niall2
ShopNoGUI added Users,Login and Main Menu for both Admin and User.
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' into niall2
ShopNoGUI update and Supplier Number and Address added
Admin menu
Merge branch 'master' into niall2

Conflicts:
	src/ShopNoGUI.java
	
	Conflicts Resolved: Admin User Menu added
View Customer list added in Customer Menu
SupplierMenu
Supplier Menu
Extra lines from diles
Merge branch 'master' of https://github.com/fcpteam1/project
Add New Customer method started
Supplier menu view
Merge branch 'master' of https://github.com/fcpteam1/project
Supplier menu
Customer Menu
Create Customer Option Added*
*Printing out customer menu twice after creating Customer.