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