Exercise 3.
Merge pull request #3 from thorinmesser/master

Exercise 3.