Merge endringer
Merge branch 'master' of https://github.com/RosaRom/systemutvikling.git