jajajajaja
Merge pull request #8 from Sufrostico/master

jajajajaja
Merge remote-tracking branch 'upstream/master'

Conflicts:
	prueba.py