changed reports
resolved conflicts
Notes
Merge branch 'Cycle2'
Modified EmployeeController