11
11
11
11
Merge branch 'master' of https://github.com/birch0930/assignment1.git

Conflicts:
	WebContent/sections/timesheet/sidebarLeft.xhtml
	src/main/java/ca/bcit/infosys/controller/EmployeeController.java