add scrolling JS to nav
styled h2
merging
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide

Conflicts:
	styleGuide/public/stylesheets/application.css
	styleGuide/sass/_base.scss