working on header bootstrap
working on header bootstrap
Merge branch 'nav_and_search' of github.com:xxSandiLLyxx/Launch-Box-4.0-Schools into nav_and_search

Conflicts:
	app/assets/stylesheets/pages.css.scss
rebase problems
Merge branch 'nav_and_search' of github.com:xxSandiLLyxx/Launch-Box-4.0-Schools into nav_and_search
fixed merge conflict
about to create pull reuest
responsive desogn
4.0 Styles
Merge pull request #5 from xxSandiLLyxx/nav_and_search

Nav and search