Problem resolved, indented and commented
Merge ProgrammingAssignment2
Problem resolved, indented and commented