update
merging conflicts
ci box color updates - fading divs not in view
Merge pull request #170 from shutter111/master

CI Box colours and fading divs not in view