commit after merge

looks like the merge brought the style.css file back