done chapter 7
Merge branch 'chapter_7'