added other instructors
merge conflict resolution.