lays out teaser page
Merge pull request #20 from rabellamy/top-bar-is-back

lays out teaser page
adds header/footer layout media query
Merge pull request #21 from rabellamy/header-footer

adds header/footer layout media query
Merge remote-tracking branch 'upstream/master'

Conflicts:
	sass/nyc-camp.scss
Merge pull request #29 from rkellertvd/schedule

Schedule
Update nyc-camp.scss

Fixed merge conflict for @import "partials/components/secondary-navigation-topbar";
Adresses #11, footer organism -- also added placeholder logos to style-tile (just for fun)
Merge pull request #30 from rkellertvd/footer

Adresses #11, footer organism -- added placeholder logos to style-tile (just for fun)