setting Menu, css
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
menu conflic - resolved
update rudy: new-user, login page, settings
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
settings
Merge branch 'master' of https://github.com/rrebucas/payrollsystem
changes last day
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/ps_list_employees.php
	files/ps_theme/css/list.css
last najud ni...............