Pre merge commit
Merge branch 'master' into niall2
InvoiceTest fixed to match changes
Merge branch 'master' into niall2
Merge branch 'master' into niall2
Admin menu
Merge branch 'master' into niall2

Conflicts:
	src/ShopNoGUI.java
	
	Conflicts Resolved: Admin User Menu added
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.
Merge branch 'Shane'
Fixed errors in ShopNoGUI
Merge branch 'Shane'
Supplier Finally up
Customer menu completed in ShopNoGUI