solve conflict
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git

Finish exception handling on StaffUI
Conflicts:
	RRPSS/src/RRPSS/StaffUI.java
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git
Updated StaffUI
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git

Conflicts:
	RRPSS/src/RRPSS/StaffUI.java
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git
CheckCheck
Merge branch 'master' of https://github.com/BestTeamSEA/oodp_project.git