finished color set
finished color set
Merge branch 'master' of https://github.com/CodeMonkeyism/CMPT350