Added employee type class and methods to employee class.
Merge remote-tracking branch 'origin/master'