made navbar, search, fixed routes
merge
deleted log
Merge branch 'navbar'