Nothing very useful
Added seach bar

Conflicts:
	herring.js
Merge branch 'master' of https://github.com/tkerber/project-herring

Conflicts:
	herring.js
	index.html
Merge branch 'master' of https://github.com/tkerber/project-herring