salary module
updated salary view
Merge branch 'master' of github.com:garimajoshi/payroll
updated controllers