Merge remote-tracking branch 'origin/Klim' into NySprint2
god parrot der virker
Merge branch 'NySprint2' of https://github.com/WhyNotZoidberg/SW6Parrot into NySprint2
testing changes
Merge remote-tracking branch 'origin/NySprint2' into Klim