eswer commit
Merge branch 'master' of https://github.com/GVP-Eswervivekanandavarma/Payroll
eswer commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	clientpages/payslip.html