Got lab3b to work
Merge branch 'master' of https://github.com/eichelkrauta/COMP4300-P1
Merged changes together and fixed merging bugs