Merge branch 'search' of https://github.com/sassafrass6/cs373-idb into search
conflict resolution (repeat)
Conflicts:
	local-html/index.html
Search page test. Should look nicer.