removed junk from style.css
Merge pull request #65 from brucetoddlee/removed_conflict_notice_css

removed junk from style.css