hola!
Merge branch 'master' of https://github.com/wartetris/practica1
esta es la buena  he arreglado un conflictor

Conflicts:
	Practica1/Practica1.cpp