Merge branch 'master' of...

Merge branch 'master' of https://gitlab.stud.idi.ntnu.no/bachelor-paa-bittet/soitool into modul-for-fraser-knyttet-til-kodeord-working-title