Finished week 7

Finished and uploading for grading