Colorpicker

Merged both ryan and luke's work