Added color by compatibility
Merge branches 'master' and 'master' of https://github.com/kenlimmj/cs3300_project1