EmployeeTable.html conflict

Conflicts:
	app/views/EmployeeTable.html