Merge pull request #1 from xxSandiLLyxx/nav_and_search

Nav and search
added tool_page.html
Merge branch 'toolpage'
Merge pull request #2 from xxSandiLLyxx/toolpage

added tool_page.html
added mock-up like html to toolpage.html.erb
Merge branch 'master' of github.com:xxSandiLLyxx/Launch-Box-4.0-Schools
Merge branch 'toolpage'
deleted duplicate toolpage file
Merge branch 'toolpage'
added a little styling to tool_style...for buttons
Merge branch 'toolpage'
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