more things
Merge branch 'master' of https://github.com/AForsberg/TDDD24