Merge pull request #123 from mistercrunch/color_factory

Adding a color factory