added styling to links
fixed main.css merge conflict