este es el bueno
Merge branch 'master' of https://github.com/pablohe/ctpython

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

Conflicts:
	practica
hola
hola