working beta

TODO: run test cases.
TODO: output to console and to file
TODO: fix /n on printout
Merge remote-tracking branch 'origin/master'

Conflicts:
	Payroll.cpp