Grade for Class 3 Assignment
fixing merge