More work on exercise 3
Merge branch 'master' of github.com:rostgaard/02242