Crawling and parsing news
Querying Watson
Merge branch 'master' of https://github.com/jpulgarin/mappsi

Conflicts:
	app.js