Finished assignment
Merge branch 'master' of https://github.com/bashao/ProgrammingAssignment2