Fix
Merge branch 'devmax' of https://github.com/KennethAS/Fellesprosjekt into devmax