Added to String method to customer and missing saleMainPanel,
saleTablePanel and saleTableModel files
upgdated sale to work
small fix
Merge branch 'master' into Dee

Conflicts:
	src/GUI/SaleMainPanel.java
	src/model/Shop.java
	
fixed Conflicts
SaleGui deleted
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' into Dee