employee variables and methods
Merge origin/master