Getting my branch updated
Changes to stock and Customer class
Customer Class changed
Merge branch 'master' of https://github.com/fcpteam1/project
Sale GUI
Merge branch 'master' into Shane

Conflicts:
	src/model/Shop.java
	
conflicts fixed
Fixed increasing of the textfields in LoginGUI. Size of textfields are
now constant.
Updated GUI sale classes to mirror Darrens
Added Images to the tab panel
image package added
commting master
Changed saleController to Panel instead of Frame
Added to String method to customer and missing saleMainPanel,
saleTablePanel and saleTableModel files
Fixed number listings when creating a User and Customer
Merge branch 'master' into andrew
upgdated sale to work
Merge branch 'master' of https://github.com/fcpteam1/project

Conflicts:
	src/GUI/SaleController.java
	src/GUI/SaleFormEvent.java
	src/GUI/SaleFormListener.java
	src/GUI/SaleFormPanel.java
	src/GUI/SaleFormPanel2182014.java
	src/GUI/SaleGui.java
	src/GUI/SaleTextPanel.java
	src/GUI/SaleToolbar.java
	src/model/Shop.java
sale name changed
Merge branch 'master' of https://github.com/fcpteam1/project
small fix