fixes miscommunication
comments out useless function
Merge remote-tracking branch 'daniel/colorDisplay' into Color
COLOR PUPPY WORKS