todo updates
Merge remote-tracking branch 'origin/teacher-edge' into teacher
Merge pull request #3 from datanets/teacher

Teacher