Added question 17
Fixed merge conflicts