Struktur fixat
Merge branch 'master' of https://github.com/AxelUlmestig/ETS170-A-TEAM
Fixade conflicts
Merge branch 'master' of https://github.com/AxelUlmestig/ETS170-A-TEAM