adding p26
Merge branch 'master' into answers
adding answer p26