modificado por cyn y lucho
modificado por cyn y lucho
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	exercise/todosTocan.txt
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	exercise/todosTocan.txt
Merge branch 'master' of https://github.com/pablohe/ctpython

Conflicts:
	exercise/todosTocan.txt
lucho y cynthia
lucho y cynthia
Merge branch 'master' of https://github.com/pablohe/ctpython