Fix merge conflict, integrate search engine

Fix merge conflict in index.html, which occurred between SASS and Search Integration changes.  Integrate search functionality.