Practica_0

En Unity
Borrado P0

P0
Ejercicio Blender
master cleanup, ready for sprint 1 integration
Fixing folder name mistake

Changing from "Tester_GrupA_Project" to "Tester_GrupB_Project"
Merge branch 'devel'
Deleting Folder
Deleting Conficts
Merge remote-tracking branch 'origin/devel-B'

Conflicts:
	ChicknDestroy/desing/gallinas_filo/ChickandDestroyNpcIA.pdf
	ChicknDestroy/unity/Builds/Sprint1/Linux/ChicknDestroy_Data/sharedassets2.assets
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/Materials/Material.mat
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/gallina_filo.blend
	ChicknDestroy/unity/Mainmenu Scene/Assets/New Terrain.asset
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scenes/ChicknDestroy_MainMenu.unity
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scripts/AgentNpc.cs
	ChicknDestroy/unity/Mainmenu Scene/Assets/Texture/Materials/gallina_robotica.mat
	ChicknDestroy/unity/Mainmenu Scene/Assets/Texture/roosterskin.png
	ChicknDestroy/unity/Mainmenu Scene/Assets/modelos/Claustro/Materials/Material_001.mat
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/AudioManager.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/DynamicsManager.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/EditorSettings.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/GraphicsSettings.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/InputManager.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/NavMeshLayers.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/NetworkManager.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/ProjectSettings.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/QualitySettings.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/TagManager.asset
	ChicknDestroy/unity/Mainmenu Scene/ProjectSettings/TimeManager.asset
updated readme