Finished chapter8.2
Finished chapter8.3
Fixed conflicts