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