added p23
Merge branch 'master' into answers
answered p23