Change exercise 15 to composition instead of inheritance, add Chapter 20 exercise 16