Lab 0 Part 1
Fixed merge conflict between Part 0 and Part 1