Oliver

Fixed and tested getTeacherLoc(). Still needs the cases to match exactly though.