rebase problems
Merge branch 'nav_and_search' of github.com:xxSandiLLyxx/Launch-Box-4.0-Schools into nav_and_search
fixed merge conflict