edit--- log in, new user, css.....
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/ps_admin_profile.php