Now selects by categories.
Merge branch 'master' of github.com:ftlabs/newshack-api

Conflicts:
	index.js