Merge branch 'master' of https://github.com/aljohnrey16/payrollsystem
may20
edit, update, modified May 23
Merge branch 'master' of https://github.com/aljohnrey16/payrollsystem

Conflicts:
	files/css/style.css
	files/header.php
	files/main.php
	files/menu.html
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
Merge remote-tracking branch 'upstream/master'
origin