Merge Ray's TeacherVc 2
Merge teacherVC
Merge Test