More stuff
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3

Conflicts:
	htdocs/css/jumbotron.css