Merge pull request #4 from douzmanian/fourth_exercise

Fourth exercise
exercise 5
Merge pull request #5 from douzmanian/fourth_exercise

tests fixed
Merge pull request #6 from douzmanian/exercise_five

exercise 5
merge conflicts resolved