header/footer progress
merge fix.
whatever
Merge pull request #3 from katiekatieb/katie

header/footer progress
Delete application.css.map

Remove css.map again
completed header and footer
completed header and footer 2.0
completed header and footer
Merge pull request #4 from katiekatieb/katie

Katie
gitignore fix.
gitignore test
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide into chris

* 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide:
  gitignore test
  gitignore fix.
  completed header and footer
  completed header and footer 2.0
  completed header and footer
  Delete application.css.map
  header/footer progress
gitignore local commit
add gitignore
merge conflict fix
worked in color.jade
changed background color
Merge pull request #5 from katiekatieb/colorView

Color view
Merge branch 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide into chris

* 'master' of https://github.com/katiekatieb/UXEBootCamp-B12.StyleGuide:
  changed background color
  worked in color.jade
Move .page-wrap class to properly wrap main body