Exercise 6 added for both Andrei and Cata
Merge remote-tracking branch 'origin/master'