Resubmission on lab 3 and the first draft of lab 4
Merge remote-tracking branch 'origin'