Conflict errors fixed
Merge branch 'master' of https://github.com/fcpteam1/project

Conflicts:
	src/GUI/MainMenuGUI.java
Fixed