Assigment 5 updated
Merge pull request #21 from aminguito/master

Assigment 5 finished