another usefull commit
#169 model pistola

model base sense texturitzar
#169 model pistola

textura.png
#169model pistola

tedtura de la culata i model texturitzat llest per a ser testejat (no
per a integrar)
#170 animacio pistola

pistola amb animació de disparar i fbx de pistola i pistola amb
animacio ja que es el mateix objecte
fbx dels objectes sense camera
a usefull commit
Manos agregadas (gallina robot2)
Merge branch 'devel-C-D' of https://github.com/eloipuertas/ES2013Dijous into devel-C-D
#147 Integracio de #169 i #170 a Unity. NO ENTRA A SP3
Actualitzacio d'arxius
Main Char con 2 modelos
Issue #223 Fixed the weight of feathers with the bones of model of crazy rooster in blender
Issue #108 @handrez Images of leader roozter and crazy rooster
Merge branch 'master' of https://github.com/eloipuertas/ES2013Dijous into devel
#212 Merge devel into devel-C-D
Merge branch 'devel' into devel-B
Canvis efectuats per fer-ho funcional a mac
#277 Done

Ready for Test, and for up to devel.
Merge remote-tracking branch 'origin/devel' into devel-A

Conflicts:
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/gallina_robot1_escopeta.fbx.meta
	ChicknDestroy/unity/Mainmenu Scene/Assets/Blender/gallina_robot1_katana.fbx.meta
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scenes/ChicknDestroy_Terrain.unity
	ChicknDestroy/unity/Mainmenu Scene/Assets/Scripts/PlayerController.cs