Changes to button names in ProfitandLoss
Changes to user and customer table id.
Conflicts fixed
Merge branch 'master' into Shane
fixed jar errors
Merge branch 'master' of https://github.com/fcpteam1/project/
Merge branch 'master' into darren

Conflicts:
	src/GUI/MainMenuGUI.java