Lecture 4 tasks.
Resolved merge conflicts.