Getting rid of some extra costume color code

Doesn't need to be in there anymore with the new way we're doing costume
color changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	objects.js