A lo loco
Houston tenemos un problema
Merge branch 'master' into juja

Conflicts:
	src/modulo_equal.pyc
Version buena