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
Merge branch 'master' into Shane

Conflicts:
	src/GUI/MainMenuGUI.java
	src/images/profitandloss.png
fixed