prueba
Merge branch 'master' of https://github.com/Hector-hedb12/Zombies.git

Conflicts:
	Classes/Modelo/constant.h
Quitando cables
Merge branch 'master' of https://github.com/Hector-hedb12/Zombies.git
arreglando errores
Merge branch 'master' of https://github.com/Hector-hedb12/Zombies.git