#corrección_de_errores_1
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scenes/04_juego_alex_nivel_3.unity
Merge branch 'master' of https://github.com/SilesR/Escav-GameJam