Fixed merge conflicts
Added InMemoryTeacherRepository