aljohn update. May 29
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/menu.php
	files/ps_list_employees_ren.php
Merge remote-tracking branch 'upstream/master'

Conflicts:
	files/menu.php
	files/ps_list_employees_ren.php