adding employee type to employee
Merge remote-tracking branch 'origin/master'