Fix error in merging
index on neural: e7cc494 Fix error in merging
WIP on neural: e7cc494 Fix error in merging
Add NN files and tests
Merge branch 'neural'

Conflicts:
	controllers/search.js
	public/javascripts/controllers/search-controller.js
Integrate NN with search
Merge branch 'master' of https://github.com/wakati/benefisher

Conflicts:
	controllers/search.js
fix test to account for nn