Exercise 15
Merge pull request #1 from jantamps/ex15

Exercise 15