edited ProgrammingAssignment2