Assigment 5
Merge pull request #11 from markez92/master

Assigment 5