finnished chapter 11
Merge branch 'mailer'
finnished chapter 11