Fixed db code
Merge branch 'master' of https://github.com/DBeath/feedrsub

Conflicts:
	db/test.js
	feedrsub.js
	package.json
Fixed merge