do exercise 1 and 2
Merge branch 'develop' into exercises9.6
finish exercise 3