Implementar el terreny de l'habitació dissenyada a l'Issue #112
Merge branch 'Grupo-CD' of https://github.com/eloipuertas/ES2013Dimarts into Grupo-CD

Conflicts:
	Badass_Upgrade/DESIGN/TaulaHabitacio1/tableTexture.jpg
	Badass_Upgrade/DESIGN/TaulaHabitacio1/tableTexture2.jpg
	Badass_Upgrade/DESIGN/TaulaHabitacio1/taula1.blend
	Badass_Upgrade/DESIGN/TaulaHabitacio1/taula1.blend1
	Badass_Upgrade/DESIGN/TaulaHabitacio1/taula1.blend2
	Badass_Upgrade/DESIGN/TaulaHabitacio1/taulaHabitacio1.fbx