Fixed colorPicker issues.
Merge branch 'master' of github.com:connor4312/startup-weekend