Multiple changes.
Merge branch 'master' of https://github.com/TCSS360Group5/MSEE.git

Conflicts:
	Peer Rev Syst/src/gui/ProgramGUI.java
Renamed some things.
Commit for Check-In 5.
Merge branch 'master' of https://github.com/TCSS360Group5/MSEE.git

Conflicts:
	Peer Rev Syst/src/gui/ConferencePanel.java
	Peer Rev Syst/src/gui/ProgramGUI.java