Corrected changes improperly set in catalog.css

Conflicts:
	stylesheets/style.css
Correct thread:hover highlighting
Merge branch 'master' of github.com:vichan-devel/Tinyboard

Conflicts:
	stylesheets/style.css
Merge https://github.com/vichan-devel/vichan
Merge branch 'master' of https://github.com/ctrlcctrlv/8chan

Conflicts:
	stylesheets/style.css
Merge branch 'master' of https://github.com/ctrlcctrlv/8chan

Conflicts:
	stylesheets/style.css

quick merge