added teachers
merges with master