Assignments

Please resolve the merge conflicts.