JSON's not parsing properly, help!
Merge branch 'master' of https://github.com/mombi93/newsly

Conflicts:
	backend/server.js