solution for exercise 2
Merge branch 'master' into jpg