organized scss
completed typography content
Merge pull request #10 from katiekatieb/katieChris

fixed scss issue
Update .gitignore file rid us of the css.map file once and for all
Delete application.css.map
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide

* 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide:
  completed typography content
  organized scss

Conflicts:
	styleGuide/public/stylesheets/application.css.map
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide

* 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide:
  Delete application.css.map
add bower-bourbon and bower-neat to file
Reorganize @import order once again. Needed to allow fonts to render correctly
Css update on compile
Add bower-neat to project.
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide into bower-neat

* 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide:
  Add bower-neat to project.
  Css update on compile
  Reorganize @import order once again. Needed to allow fonts to render correctly
  add bower-bourbon and bower-neat to file
  Delete application.css.map
  Update .gitignore file rid us of the css.map file once and for all
  completed typography content
  organized scss

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