Code should be fully functional
Merge branch 'master' of https://github.com/DanielEichman/Lab3_Eichman