fixed according to hw instructions.
Merge branch 'master' of https://github.com/Rymdsnigel/Labb_4_WS