required functionality
Merge branch 'master' of https://github.com/JeremyGruszka/Lab6