added incentive
added payroll.xml
modified payroll.py
Removed conflicts

Merge branch 'master' of https://github.com/fishappear/pay_roll

Conflicts:
	payroll.py
Merge pull request #18 from akanksha-singh/master

modified