Questions 17 & 31 completed
Merge pull request #14 from joannawallace/master

Questions 17 & 31 completed