category filter
Merge branch 'master' of https://github.com/divir94/Wild-Hacks

Conflicts:
	js/d3-force-layout.js
Merge branch 'master' of https://github.com/divir94/Wild-Hacks