added p16
Merge branch 'master' into answers
added solution to p15