Added trending.
Resolved conflicts
Merge branch 'master' of github.com:simonswain/haystack

Conflicts:
	run.js