Updated version
Merge https://github.com/nayda-b/ProgrammingAssignment2