Assignments belong to teacher
Merge conflicts resolved