Student number and name added
chapter 2 added
waistcoat changed to vest and orange marmalade to blackberry jam
conflicts solved