edited rudy_test
Merge branch 'master' of https://github.com/aljohnrey16/payrollsystem
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/rud_test/css/style.css
	files/rud_test/list.html
	files/rud_test/main.html
	files/rud_test/nav.html
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
ren_may20
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/rud_test/css/style.css
	files/rud_test/list.html
	files/rud_test/main.html
	files/rud_test/nav.html
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html
edit
ren_may20 add
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html
	files/ps_xls_import.html
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html
	files/ps_xls_import.html
menu resolved may20
delete back up conflict
delete rud_test
may21 - delete rud test folder
edited_css  May21
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
may21 - jegger
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
change extension into PHP