adding p20
Merge branch 'master' into answers
added answers for p20
small tweak:
fixing minor merge