my changes
Merge ProgrammingAssignment2