first cut of having a current employee
Merge branch 'master' into current_employee