second commit
Merge https://github.com/MathieuRasa/ProgrammingAssignment3