Improve image handling in catalog to improve consistency
Merge branch 'master' of https://github.com/ctrlcctrlv/8chan

Conflicts:
	stylesheets/style.css

quick merge
Remove erroneous data and fix indentation
Merge pull request #92 from kaernyk/master

Improve image scaling in catalog