Resubmitting pull request

submit assignment 2.1, 2.2, and draft 3.1