update for class assignment
Merge ProgrammingAssignment2
update for class assignment