Yo tambien he estado trabajando
Merge branch 'master' of https://github.com/int-0/gittest

Conflicts:
	hola.py