Grade for Class 3 Assignment
fixed merge conflict