added p17
Merge branch 'master' into answers
solution to p17