various color changes
Merge branch 'master' of https://github.com/dcorwin/15237-project1