Johan fixat general r
Merge branch 'master' of https://github.com/AxelUlmestig/ETS170-A-TEAM

Johan fixat general erq