updated CSS tutorial
fixed merge conflicts