c9 merge
Merge branch 'master' of https://github.com/mandarl/node-rss-combine

Conflicts:
	server.js