Merge remote-tracking branch 'origin/master' into Patrik
Merge branch 'Patrik' of https://github.com/TopBordGruppeProject4/TuristApp4 into Patrik