Fix merge conflict, partial search engine integration

Fix merge conflict in index.html, which occurred between SASS and Search Integration changes.  Commit partial integration of search functionality.