Added color picker
Merge pull request #4 from acperez/development

Added color picker