teachers can add assignments
fix merge conflicts