Added view file with __init__.py and tryton.cfg
Conflicts Resolved

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

Conflicts:
	__init__.py
	tryton.cfg
reolved conflict
Deleted ~ files and README, Updated Menu

* Deleted README as README.md is already there to describe.
* setup.py: Updated README to README.md
* attendance.xml: removed dummy menu item
* payroll.xml: updated parent menu
Added validations to the fields
Merge pull request #12 from tarunbhardwaj/master

Deleted '~' files and updated menu item
Adding total salary field to the extended model
Conflicts Resolved

Conflicts:
	__init__.py
	employee.py
Merge pull request #15 from simmianand/master

Added fields and validations to extended employee field
Removed conflicts

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

Conflicts:
	payroll.py