jegger
jeg del
Merge branch 'master' of https://github.com/rrebucas/payrollsystem

Conflicts:
	files/menu.html