add search bar in navbar
Merge branch 'master' into searching
reworked bootstrap navbar
removed bootrap.js
Merge branch 'searching'