Merge pull request #20 from aminguito/master

Assigment 3 and 4 updated
Assigment 5 updated