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
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
modification, updates, add new user page May 21
delete old folder
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html
	files/ps_xls_import.html
updates -- May 21 ..
jegger
jeg del
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

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

Conflicts:
	files/css/list.css
	files/css/profile.css
	files/ps_admin_profile.html
	files/ps_list_employees.html
	files/ps_view_profile.php
back up
update.... may 20
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
delete