Entire exercice done
Merge pull request #2 from Nanoxium/origin/master

Entire exercice done