Adjust css on header
merging
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide

Conflicts:
	styleGuide/public/stylesheets/application.css
	styleGuide/sass/_base.scss
fixed desktop nav/h1
fixed color swatches
Merge pull request #20 from katiekatieb/hi

Hi
font weights
whatever
fixed type weight