lab 5 finished
Merge branch 'master' of https://github.com/JackCuthbert/2622ict