Modificando

modificando
Merge branch 'master' of github.com:thedarkfather/practica2

Conflicts:
	adios.py