updated assignment
Merge https://github.com/yychik/ProgrammingAssignment2