Added color picker button
Merge branch 'master' of https://github.com/jsun1/PixelData