swaped 'silly' for the pub list
Merge branch 'master' of https://github.com/tim333/silly
tried to fix
Conflicts:
	index.html