update
Merge branch 'master' of github.com:mandarl/node-rss-combine

Conflicts:
	server-parasite.js
	server.js
Merge branch 'master' of github.com:mandarl/node-rss-combine
Added gnews.js