fix reference to oekaki in readme; fixes vichan-devel#89
oh hey look I just fixed #8 search.php

It was just a typo, an horrible typo.
Add timer to auto reload js

Conflicts:
	js/auto-reload.js
auto-reload.js: don`t scroll up
auto-reload.js: it`s actually setTimeout, not setInterval, right?
Attempt to fix scroll to anchor issue
Update style.css

Added "cursor" to "options_tab_icon" according to https://github.com/ctrlcctrlv/8chan/issues/80
post-hover.js: show a popup preview if a reply is only partially on screen; fixes ctrlcctrlv#84
Corrected thread padding via style.css

Conflicts:
	stylesheets/style.css
Adjust theme via catalog.css & style.css

Changes to catalog.css:

  - Forced all threads to a height of 300px and reduced padding to
    improve consistency. I think it improves the readability quite a bit
    but I may be alone in thinking this way.
  -

Changes to style.css:

  - Removed additional padding to allow new catalog spacing

Conflicts:
	stylesheets/style.css
Merge branch 'master' of github.com:vichan-devel/Tinyboard
Fixed unanimating gifs in the catalog
Fixes catalog href on a potential /res/ board
Fix thumbnail width/height in API

The API currently has the thumbnail widths and heights switched around
Add file hash to API

The API currently lacks the Base64 encoded file hash 4chan's API provides, which assists in file de-duplication by archive software.
we don`t use tooltipster anymore, do we?
catalog.css is no longer used
Merge https://github.com/vichan-devel/vichan

Conflicts:
	js/auto-reload.js
	stylesheets/catalog.css
	stylesheets/style.css
Merge branch 'master' of https://github.com/ctrlcctrlv/8chan

Conflicts:
	stylesheets/style.css

Correct style.css blunder and merge changes