Removed TeacherBasics from master branch
Merging: