Assigment 6
Merge pull request #13 from markez92/master

Assigment 6