refactored IColorStrategy
Merge branch 'colorstrategy-refactoring'