updates
Merge branch 'master' of https://github.com/mcornell009/Color2