Merge pull request #99 from berenm/master
authorTravis Swicegood <travis@domain51.com>
Wed, 8 Feb 2012 23:32:24 +0000 (15:32 -0800)
committerTravis Swicegood <travis@domain51.com>
Wed, 8 Feb 2012 23:32:24 +0000 (15:32 -0800)
Improved color framework


Trivial merge