finished lab
updated
Merge branch 'master' of https://github.com/DanielEichman/Lab2