Lab 1 Part 4
Fixed merge conflict between Part 3 and Part 4