mkfl
Merge branch 'master' of https://github.com/SW2A305/Eksamen
Merge remote-tracking branch 'origin/master' into Tristan