endret 30.11 til 30.10
Merge branch 'master' of https://github.com/arlensyver/Test