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

Conflicts:
	files/menu.php
menu update
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
setting Menu, css
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
menu conflic - resolved
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
settings