Countcolorblocks

We now treat color blocks just like all other blocks.  They are counted in the block total and the ideal numbers for each level that requires color blocks have been updated.  Each set color is actually two blocks - one for the set color block and one for the color block itself that goes inside.