Lab 1 Part 3
Lab 1 Part 4
Merge branch 'Lab1Part3' into Lab1
Fixed merge conflict between Part 3 and Part 4
Merge branch 'Lab1' into develop