Merge branch 'master' of https://github.com/MitchLehrer/Labb6.git