conflict #1

updated CSS3 but conflicted by work today