finished chapter 4
Merge branch 'testing'