fixed player .fbx
Added bird prefab
Merge branch 'modeloPlayer'

Conflicts:
	Assets/objects/player_model.fbx.meta
Merge branch 'master' into Parte-Roxanne
Merge branch 'feature/ScriptIlusion'
Corregido el movimiento del pj: no vuela y lo se desliza
Tamaño de las palmeras x2
Added head snake for blender. Re-organized prefabs.
Fixed small error.
Merge branch 'master' of https://github.com/pabloppp/Albondiga-GameJamUA

Conflicts:
	Assets/New Terrain.asset
	Assets/Standard Assets/Toon Shading/Toony-Basic.mat
	Assets/Standard Assets/Toon Shading/Toony-BasicOutline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted Outline.mat
	Assets/Standard Assets/Toon Shading/Toony-Lighted.mat
	Assets/objects/player_model.fbx.meta
serpiente animada
Sincronización con master
no message