Merge code for Lab 3
Lab 3 Problem 1 complete