added color picker
Merge pull request #2 from aethawalka/master

added color picker