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.
Added Images to the tab panel
image package added
commting master
Changed saleController to Panel instead of Frame
Fixed number listings when creating a User and Customer
Merge branch 'master' into andrew
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
small fix
Merge branch 'master' into Dee

Conflicts:
	src/GUI/SaleMainPanel.java
	src/model/Shop.java
	
fixed Conflicts