editted some error outputs.
Merge branch 'master' of https://github.com/INTROSETEAMKATRINA/Iteration2Code

Conflicts:
	PayrollSystemController.java