Code review
Merge branch 'parametricity2' of github.com:simhu/cubical into parametricity2
Finished color resolver