Added more stuff to exercise 2
Merge branch 'master' of github.com:rostgaard/02242