Did nothing

blah
Merge branch 'master' of https://github.com/Saucymeatman/RainbowHippie
Merge branch 'master' of https://github.com/Saucymeatman/RainbowHippie
Fixed rainbow collision, other minor bugs