Fixing logo sizing
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3
Fixing logo to be img instead of div
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3

Conflicts:
	htdocs/index.html