Lab 4 with changes
Merge pull request #5 from sabsowitz/lab_04

Lab 4 with changes