done
Merge https://github.com/SimonChiu/ProgrammingAssignment2