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

Conflicts:
	index.html
Merge branch 'master' of https://github.com/tkerber/project-herring
Click off info boxes to close