Merge commit
Merge branch 'master' of https://github.com/Skjortan/lab3