Had to commit to access my branch
Commit StockList
Controller View re up
Merge branch 'master' of https://github.com/fcpteam1/project
Conflicts fixed
Conflicts:
	src/Controller.java
	src/MainMenuGUI.java
	src/SupplierGUI.java
	src/View.java
Removed order errors
basic order gui
Merge branch 'master' into darren

Conflicts:
	src/OrderGUI.java
Simple Order forms finally implemented in main
Seperated into mvc layout and User GUI added
Order GUI changes
Added Order GUI to MVC layout
Merge branch 'master' into christine

Conflicts:
	src/Controller.java
	src/MainMenuGUI.java
	src/Product.java
	src/Stock.java
	src/Supplier.java