[Lauren3] Fixed a merge conflict with newer additions to site.
[Lauren3]Fixed yet another merge conflict with topbar.css,
Merge pull request #25 from mlauren/Lauren3

[#43418349]Here I added a few common styles for reference in the style guide.
[#43426885] Fixed a merge conflict with typography.scss.
[#43426885] Fixed a merge conflict with typography.scss.