exercise 12
Merge pull request #4 from kSzeg/exercise_12

exercise 12