modifique la scene
Merge branch 'master' of github.com:ConcoMB/ChileGames

Conflicts:
	tp3/src/DungeonGilada/Assets/Scenes/Play.unity
Merge branch 'master' of github.com:ConcoMB/ChileGames

Conflicts:
	tp3/src/DungeonGilada/Assets/Cemetery/Demo/New Terrain 2.asset
	tp3/src/DungeonGilada/Assets/Scenes/Play.unity
Merge branch 'master' of github.com:ConcoMB/ChileGames

Conflicts:
	tp3/src/DungeonGilada/Assets/Scenes/Play.unity
Merge branch 'master' of github.com:ConcoMB/ChileGames
Merge branch 'master' of github.com:ConcoMB/ChileGames
assetsCharacters
assetsCharacters