Merge branch 'maxmaxmax' into max2
Merge branch 'max2' of https://github.com/KennethAS/Fellesprosjekt into max2