prelab part
Merge branch 'master' of https://github.com/RyanRedhead/Lab6