Finished Lab 3
Lab 3 with corrections.
fixed indentations
Fixed merge conflict
Merge pull request #3 from sabsowitz/lab_03

Finished Lab 03