commit 8

new block of code
commit 10

new block 3
commit 11
commit 12
commit 13
commit 14
commit 15
commit 16
Merge branch 'master' into branch-2
commit 17
commit 18