started logic
merged with master to start on logic
what was this brnch for
merging color logic with master
Merge pull request #13 from alangster/color-logic

Color logic