I have done the assignment
Merge ProgrammingAssignment2 into Charles