punkt 1 o 2
Merge branch 'master' of https://github.com/PHjalmars/TDDD24