Lab 2 Part 1
Lab 2 Part 2
Lab 2 Part 3
Merge branch 'Lab2Part1' into Lab2
Fixed merge conflict between Part 1 and Part 2
Fixed merge conflict between Part 2 and Part 3
Merge branch 'Lab2' into develop