second commit
Merge branch 'rama1'

Conflicts:
	ejemplo.py