Para variar borrando .pyc
Merge branch 'master' into busqueda

Conflicts:
	urls.pyc