insertamos una linea
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	practica
ahora si!
Merge branch 'master' of https://github.com/pablohe/ctpython