Notes
Merge branch 'Cycle2'
Modified EmployeeController
catergories
conflict resolution