Finished lab 02 exercises
Merge pull request #2 from sabsowitz/real_lab_02

Finished lab 02 exercises
Fixed merge issues
Fixed merge conflict