resolved merge conflicts, but toolpage content is displaying double even if the toolpage content is not duplicated in the code.
removed one of the yields in app.html.erb
cleaned css
fixed some merge conflicts in app.html.erb and tool_page.html.erb. Sticky footer is laying over page content, not at the bottomgit add .! Fix that first.
dynamic nav logo and header change
stuff
merge to master
cleaned css
dynamic nav logo and header change
stuff
merge to master
master copy pusj
Merge branch 'responsive_nav' of github.com:xxSandiLLyxx/Launch-Box-4.0-Schools into responsive_nav
removed weirdly added folder
trying to fix a responsive header
added Sandy's css updates for sticky-footer-navbar and my changes to tool_pages_style
responsive h1 in nav
Merge pull request #8 from xxSandiLLyxx/responsive_nav

Responsive nav
pulles css changes icluding bootstrap from master
changed url to paper-prototyping in routes