sale name changed
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' into Dee
Small Fixes
Order Form Panel changed.
Merge branch 'master' of https://github.com/fcpteam1/project/
finish
sale png restore
Proffit and Loss tab added with image
Merge branch 'master' into Shane
Commented out Profit and Loss tab to fix error for now.
Conflict errors fixed
Merge branch 'master' of https://github.com/fcpteam1/project

Conflicts:
	src/GUI/MainMenuGUI.java
Fixed
no change
Added Profit and Loss tab, does nothing as yet.
Merge branch 'master' into Shane

Conflicts:
	src/GUI/MainMenuGUI.java
	src/images/profitandloss.png
fixed
added new profitandloss image
Orders can be edited, deleted and processed
Merge branch 'master' into darren