Finished exercice 2
Merge with origin master