added new-vendor selectors to style.css, styled new vendor page
fixed merge conflicts