finished color set
Remove unneeded code
Change resourse name
finished color set
Merge branch 'master' of https://github.com/CodeMonkeyism/CMPT350
Merge remote-tracking branch 'origin/master' into what