Fixed error when color change
Merge remote-tracking branch 'origin/Klim' into Sprint5
Merge branch 'Sprint5' of https://github.com/WhyNotZoidberg/SW6Parrot into Sprint5