Updated Chapters 3 and 4
Resolved merge conflicts