finish chapter 3
Merge branch 'guard-testing'