added chap2 slides
fixed merge issues