Assigment 6
Merge pull request #14 from aminguito/master

Assigment 6