figur 2.3
Merge branch 'origin/master'