Added colors and object ids
Merge branch 'master' of https://github.com/antifinidictor/cse222a