fifth exercise
merge conflicts resolved
Merge pull request #7 from douzmanian/fourth_exercise

fifth exercise