Edited ProgrammingAssignment2