Merge conflicts
Merge branch 'master' of github.com:vtomasr5/distribuits

Conflicts:
	meneame/obtenerNoticias.py
Arreglado bug de peticiones concurrentes